July 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] do not execute tests on regular build
by Tony CHEMIT 10 Jul '17

10 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 55d1f127 by Tony CHEMIT at 2017-07-10T15:55:03+02:00 do not execute tests on regular build - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ build: stage: Build <<: *before_script_default script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify -DskipTests/' | bash only: - develop - develop-5.x View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/55d1f1279e4e9c8cda8a5d5e0a8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/55d1f1279e4e9c8cda8a5d5e0a8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Utilisation des templates dans le répertoires des ressources (Closes #791)
by Tony CHEMIT 10 Jul '17

10 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36b0c6bc by Tony CHEMIT at 2017-07-10T15:48:14+02:00 Utilisation des templates dans le répertoires des ressources (Closes #791) - - - - - 30 changed files: - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing/pom.xml - application-swing/src/main/assembly/i18n.xml - application-swing/src/main/assembly/map.xml - application-swing/src/main/resources/META-INF/ftl/about_en.ftl → application-swing/src/main/ftl/about_en.ftl - application-swing/src/main/resources/META-INF/ftl/about_es.ftl → application-swing/src/main/ftl/about_es.ftl - application-swing/src/main/resources/META-INF/ftl/about_fr.ftl → application-swing/src/main/ftl/about_fr.ftl - application-swing/src/main/resources/META-INF/ftl/connexionTestResult_en.ftl → application-swing/src/main/ftl/connexionTestResult_en.ftl - application-swing/src/main/resources/META-INF/ftl/connexionTestResult_es.ftl → application-swing/src/main/ftl/connexionTestResult_es.ftl - application-swing/src/main/resources/META-INF/ftl/connexionTestResult_fr.ftl → application-swing/src/main/ftl/connexionTestResult_fr.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceConnectionReport_en.ftl → application-swing/src/main/ftl/dataSourceConnectionReport_en.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceConnectionReport_es.ftl → application-swing/src/main/ftl/dataSourceConnectionReport_es.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceConnectionReport_fr.ftl → application-swing/src/main/ftl/dataSourceConnectionReport_fr.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceInformation_en.ftl → application-swing/src/main/ftl/dataSourceInformation_en.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceInformation_es.ftl → application-swing/src/main/ftl/dataSourceInformation_es.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceInformation_fr.ftl → application-swing/src/main/ftl/dataSourceInformation_fr.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourcePolicy_en.ftl → application-swing/src/main/ftl/dataSourcePolicy_en.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourcePolicy_es.ftl → application-swing/src/main/ftl/dataSourcePolicy_es.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourcePolicy_fr.ftl → application-swing/src/main/ftl/dataSourcePolicy_fr.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceSelectModeResume_en.ftl → application-swing/src/main/ftl/dataSourceSelectModeResume_en.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceSelectModeResume_es.ftl → application-swing/src/main/ftl/dataSourceSelectModeResume_es.ftl - application-swing/src/main/resources/META-INF/ftl/dataSourceSelectModeResume_fr.ftl → application-swing/src/main/ftl/dataSourceSelectModeResume_fr.ftl - application-swing/src/main/resources/META-INF/ftl/initStorage_en.ftl → application-swing/src/main/ftl/initStorage_en.ftl - application-swing/src/main/resources/META-INF/ftl/initStorage_es.ftl → application-swing/src/main/ftl/initStorage_es.ftl - application-swing/src/main/resources/META-INF/ftl/initStorage_fr.ftl → application-swing/src/main/ftl/initStorage_fr.ftl - application-swing/src/main/resources/META-INF/ftl/storageModelDataSourceConfiguration_en.ftl → application-swing/src/main/ftl/storageModelDataSourceConfiguration_en.ftl - application-swing/src/main/resources/META-INF/ftl/storageModelDataSourceConfiguration_es.ftl → application-swing/src/main/ftl/storageModelDataSourceConfiguration_es.ftl - application-swing/src/main/resources/META-INF/ftl/storageModelDataSourceConfiguration_fr.ftl → application-swing/src/main/ftl/storageModelDataSourceConfiguration_fr.ftl - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveResourceManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/36b0c6bc6c0f8455e99c63591bd… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/36b0c6bc6c0f8455e99c63591bd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mise à jour des librairies (Closes #790)
by Tony CHEMIT 10 Jul '17

10 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c8ca2479 by Tony CHEMIT at 2017-07-10T14:51:04+02:00 Mise à jour des librairies (Closes #790) - - - - - 3 changed files: - application-swing/pom.xml - pom.xml - src/site/resources/img/architecture.svg Changes: ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -61,8 +61,6 @@  <exec.mainClass>${maven.jar.main.class}</exec.mainClass> - <geoToolsVersion>16.0</geoToolsVersion> - </properties> <repositories> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -172,9 +172,7 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> -  - <licensePluginVersion>1.9</licensePluginVersion> - + <jaxxVersion>3.0-alpha-6</jaxxVersion> <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> @@ -184,13 +182,14 @@ <nuitonConverterVersion>1.0</nuitonConverterVersion> <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> <xworkVersion>2.3.32</xworkVersion> - <flexmarkVersion>0.18.9</flexmarkVersion> - <hibernateVersion>5.1.5.Final</hibernateVersion> + <flexmarkVersion>0.20.2</flexmarkVersion> + <hibernateVersion>5.1.8.Final</hibernateVersion> <sl4jVersion>1.7.25</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.11</reflectionsVersion> <webmotionVersion>2.5.3</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> + <geoToolsVersion>17.1</geoToolsVersion>  <license.licenseName>gpl_v3</license.licenseName> @@ -232,7 +231,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.6</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -268,12 +267,12 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>21.0</version> + <version>22.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.8.0</version> + <version>2.8.1</version> </dependency> <dependency> @@ -642,13 +641,13 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.4.195</version> + <version>1.4.196</version> </dependency> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>42.0.0.jre7</version> + <version>42.1.1.jre7</version> </dependency>  @@ -661,7 +660,7 @@ <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> - <version>2.6.1</version> + <version>2.6.3</version> </dependency> <dependency> @@ -706,14 +705,14 @@ <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> - <version>1.08</version> + <version>1.12</version> </dependency>  <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.0-b05</version> + <version>4.0.0-b07</version> <scope>provided</scope> </dependency> @@ -837,7 +836,7 @@ <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.22.0-CR1</version> + <version>3.22.0-CR2</version> <scope>runtime</scope> </dependency> ===================================== src/site/resources/img/architecture.svg ===================================== --- a/src/site/resources/img/architecture.svg +++ b/src/site/resources/img/architecture.svg @@ -1,4 +1,26 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> + +  <svg xmlns:ns="http://creativecommons.org/ns#" View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c8ca247937d49ee231f80df2980… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c8ca247937d49ee231f80df2980… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un traducteur dans l'application (See #788) (use now i18n 4.0-alpha-1-SNAPSHOT)
by Tony CHEMIT 10 Jul '17

10 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8d235c0b by Tony CHEMIT at 2017-07-10T14:19:28+02:00 Ajout d'un traducteur dans l'application (See #788) (use now i18n 4.0-alpha-1-SNAPSHOT) - - - - - 14 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx - application-web-configuration/pom.xml - pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -66,7 +66,7 @@  <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -461,7 +461,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> @@ -713,14 +713,14 @@ <configuration> <templateExtension>ftl</templateExtension> <templateList> - <template>ftl/about</template> - <template>ftl/connexionTestResult</template> - <template>ftl/dataSourceConnectionReport</template> - <template>ftl/dataSourceInformation</template> - <template>ftl/dataSourcePolicy</template> - <template>ftl/dataSourceSelectModeResume</template> - <template>ftl/initStorage</template> - <template>ftl/storageModelDataSourceConfiguration</template> + <template>about</template> + <template>connexionTestResult</template> + <template>dataSourceConnectionReport</template> + <template>dataSourceInformation</template> + <template>dataSourcePolicy</template> + <template>dataSourceSelectModeResume</template> + <template>initStorage</template> + <template>storageModelDataSourceConfiguration</template> </templateList> </configuration> </execution> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java @@ -89,4 +89,4 @@ public class AddFloatingObjectReferenceUIAction extends AbstractContentUIAction u.getModel().setReference(reference); } -} \ No newline at end of file +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java @@ -79,4 +79,4 @@ public class EditFloatingObjectReferenceUIAction extends AbstractContentUIAction floatingObjectReferencesManager.update(reference); u.getModel().setReference(reference); } -} \ No newline at end of file +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java @@ -73,4 +73,4 @@ public class RemoveFloatingObjectReferenceUIAction extends AbstractContentUIActi } }); } -} \ No newline at end of file +} ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.menu.config; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; @@ -42,9 +64,8 @@ public class TranslateAction extends AbstractUIAction { Objects.requireNonNull(bundles); try { ProjectUI projectUI = new ProjectUI(getMainUI(), new Project(bundles)); - projectUI.getTemplatesFilter().doClick(); - projectUI.getTranslationsFilter().doClick(); - } catch (InterruptedException | IOException e) { + projectUI.toggleFilter(); + } catch (IOException e) { throw new ObserveSwingTechnicalException("can't open i18n editor", e); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUI.jaxx @@ -8,12 +8,10 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/gpl-3.0.html>. ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -176,7 +176,7 @@ <licensePluginVersion>1.9</licensePluginVersion> <jaxxVersion>3.0-alpha-6</jaxxVersion> - <nuitonI18nVersion>3.7-SNAPSHOT</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -310,6 +310,10 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-vfs2</artifactId> </exclusion> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -349,6 +353,10 @@ <scope>compile</scope> <exclusions> <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + <exclusion> <groupId>javassist</groupId> <artifactId>javassist</artifactId> </exclusion> @@ -373,7 +381,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> <version>${nuitonI18nVersion}</version> <scope>compile</scope> </dependency> @@ -390,6 +398,12 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> @@ -408,71 +422,143 @@ <artifactId>jaxx-runtime-swing-wizard</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-hidor</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> <version>${jaxxVersion}</version> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </exclusion> + </exclusions> </dependency>  ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -106,7 +106,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -79,7 +79,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency> <dependency> <groupId>org.nuiton.topia</groupId> @@ -152,6 +152,11 @@ <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-api</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> </dependencies> </plugin> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -59,7 +59,7 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <artifactId>i18n-api</artifactId> </dependency>  View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8d235c0be810d5db2ad7663a4a4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8d235c0be810d5db2ad7663a4a4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un traducteur dans l'application (See #788)
by Tony CHEMIT 09 Jul '17

09 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d81a87ad by Tony CHEMIT at 2017-07-09T02:19:51+02:00 Ajout d'un traducteur dans l'application (See #788) - - - - - 30 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-swing/src/main/assembly/i18n.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/TranslateAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java - application-swing/src/main/resources/ftl/about_en.ftl → application-swing/src/main/resources/META-INF/ftl/about_en.ftl - application-swing/src/main/resources/ftl/about_es.ftl → application-swing/src/main/resources/META-INF/ftl/about_es.ftl - application-swing/src/main/resources/ftl/about_fr.ftl → application-swing/src/main/resources/META-INF/ftl/about_fr.ftl - application-swing/src/main/resources/ftl/connexionTestResult_en.ftl → application-swing/src/main/resources/META-INF/ftl/connexionTestResult_en.ftl - application-swing/src/main/resources/ftl/connexionTestResult_es.ftl → application-swing/src/main/resources/META-INF/ftl/connexionTestResult_es.ftl - application-swing/src/main/resources/ftl/connexionTestResult_fr.ftl → application-swing/src/main/resources/META-INF/ftl/connexionTestResult_fr.ftl - application-swing/src/main/resources/ftl/dataSourceConnectionReport_en.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceConnectionReport_en.ftl - application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceConnectionReport_es.ftl - application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceConnectionReport_fr.ftl - application-swing/src/main/resources/ftl/dataSourceInformation_en.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceInformation_en.ftl - application-swing/src/main/resources/ftl/dataSourceInformation_es.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceInformation_es.ftl - application-swing/src/main/resources/ftl/dataSourceInformation_fr.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceInformation_fr.ftl - application-swing/src/main/resources/ftl/dataSourcePolicy_en.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourcePolicy_en.ftl - application-swing/src/main/resources/ftl/dataSourcePolicy_es.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourcePolicy_es.ftl - application-swing/src/main/resources/ftl/dataSourcePolicy_fr.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourcePolicy_fr.ftl - application-swing/src/main/resources/ftl/dataSourceSelectModeResume_en.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceSelectModeResume_en.ftl - application-swing/src/main/resources/ftl/dataSourceSelectModeResume_es.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceSelectModeResume_es.ftl - application-swing/src/main/resources/ftl/dataSourceSelectModeResume_fr.ftl → application-swing/src/main/resources/META-INF/ftl/dataSourceSelectModeResume_fr.ftl - application-swing/src/main/resources/ftl/initStorage_en.ftl → application-swing/src/main/resources/META-INF/ftl/initStorage_en.ftl - application-swing/src/main/resources/ftl/initStorage_es.ftl → application-swing/src/main/resources/META-INF/ftl/initStorage_es.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d81a87ad855852ea04a0b4afe4e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d81a87ad855852ea04a0b4afe4e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] add missing license headers
by Tony CHEMIT 06 Jul '17

06 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f7d84062 by Tony CHEMIT at 2017-07-06T18:18:41+02:00 add missing license headers - - - - - 11 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/DeleteReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/QuitUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/SaveReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIModel.java - services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialTypeBinder.java - services/src/main/java/fr/ird/observe/services/dto/FloatingObjectReference.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/FloatingObjectReferencesManager.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.FloatingObjectReference; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddFloatingObjectReferenceUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.FloatingObjectReferencesManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.DataContext; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditFloatingObjectReferenceUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.FloatingObjectReferencesManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/RemoveFloatingObjectReferenceUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.content; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/DeleteReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/DeleteReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/DeleteReferenceUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.dcprefs; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/QuitUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/QuitUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/QuitUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.dcprefs; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/SaveReferenceUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/SaveReferenceUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/dcprefs/SaveReferenceUIAction.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.actions.dcprefs; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIHandler.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.dcprefs; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/dcprefs/FloatingObjectReferencesUIModel.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.ui.dcprefs; +/*- + * #%L + * ObServe :: Application Swing + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.dto.FloatingObjectReference; import java.util.List; import java.util.Optional; ===================================== services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialTypeBinder.java ===================================== --- a/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectMaterialTypeBinder.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.binder.referential.seine; +/*- + * #%L + * ObServe :: Services Binder + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.entities.referentiel.seine.ObjectMaterialType; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; ===================================== services/src/main/java/fr/ird/observe/services/dto/FloatingObjectReference.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/dto/FloatingObjectReference.java +++ b/services/src/main/java/fr/ird/observe/services/dto/FloatingObjectReference.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import java.util.Objects; /** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f7d84062fbaad85e7536762a8a2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f7d84062fbaad85e7536762a8a2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last release of eugene
by Tony CHEMIT 06 Jul '17

06 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ef73fadf by Tony CHEMIT at 2017-07-06T10:21:04+02:00 use last release of eugene - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ <mavenVersion>3.5.0</mavenVersion> - <eugenePluginVersion>3.0-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion>  <licensePluginVersion>1.9</licensePluginVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ef73fadf14d7dd81f68e4800061… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ef73fadf14d7dd81f68e4800061… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Affichage des heures sur l'écran de synchro avancée du référentiel (See #689)
by Tony CHEMIT 05 Jul '17

05 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3b0bd578 by Tony CHEMIT at 2017-07-05T14:14:15+02:00 Affichage des heures sur l'écran de synchro avancée du référentiel (See #689) - - - - - 0b91b599 by Tony CHEMIT at 2017-07-05T14:14:42+02:00 Sur la sycnrho avancée de référentiel, on doit pouvoir accepter des modifications depuis aussi des bases locales - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java @@ -143,13 +143,13 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy if (model.getConfigModel().getCentralSourceModel().getDbMode() == null) { return; } - boolean leftToRightEnabled = Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation()) + boolean leftToRightEnabled = model.getConfigModel().getCentralSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getCentralSourceModel().getDataSourceInformation()) .map(ObserveDataSourceInformation::canWriteReferential) .orElse(false); if (log.isDebugEnabled()) { log.debug("Update synchro modes: leftToRight: " + leftToRightEnabled); } - boolean rightToLeftEnabled = Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation()) + boolean rightToLeftEnabled = model.getConfigModel().getLocalSourceModel().isLocal() || Optional.ofNullable(model.getConfigModel().getLocalSourceModel().getDataSourceInformation()) .map(ObserveDataSourceInformation::canWriteReferential) .orElse(false); if (log.isDebugEnabled()) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java @@ -28,34 +28,27 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; import fr.ird.observe.services.dto.reference.ReferentialReference; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; - -import javax.swing.Icon; -import javax.swing.JTree; -import javax.swing.tree.DefaultTreeCellRenderer; import java.awt.Color; import java.awt.Component; import java.text.DateFormat; import java.text.SimpleDateFormat; +import javax.swing.Icon; +import javax.swing.JTree; +import javax.swing.tree.DefaultTreeCellRenderer; +import org.nuiton.decorator.Decorator; + import static org.nuiton.i18n.I18n.t; /** - * Le renderer pour décorer l'arbre de sélection des données. - * * @author Tony Chemit - dev(a)tchemit.fr * @since 1.2 */ public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRenderer { - /** Logger */ - private static final Log log = LogFactory.getLog(ReferentialSynchronizeTreeCellRenderer.class); - private static final long serialVersionUID = 1L; - private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy hh:mm"); + private final DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyy HH:mm"); protected transient DecoratorService decoratorService; @@ -105,7 +98,7 @@ public class ReferentialSynchronizeTreeCellRenderer extends DefaultTreeCellRende ReferenceReferentialSynchroNodeSupport node1 = (ReferenceReferentialSynchroNodeSupport) node; icon = node1.getIcon(); - ReferentialReference reference = node1.getUserObject(); + ReferentialReference<?> reference = node1.getUserObject(); Decorator<?> decorator = getDecoratorService().getReferentialReferenceDecorator(reference.getType()); text = "<html><body>" + decorator.toString(reference); text += " <i>(" + reference.getVersion() + " - " + dateFormat.format(reference.getLastUpdateDate()) + ")</i>"; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/02bf1386e0d2e83b28aa58208e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/02bf1386e0d2e83b28aa58208e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Rename ping method to getModelVersion + clean code
by Tony CHEMIT 05 Jul '17

05 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 02bf1386 by Tony CHEMIT at 2017-07-05T10:19:21+02:00 Rename ping method to getModelVersion + clean code - - - - - 8 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java - application-web/src/main/filtered-resources/mapping - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java - services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/PingService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -1701,7 +1701,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (!error) { - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); Version clientModelVersion = getModelVersion(); if (!Objects.equals(clientModelVersion, modelServerVersion)) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java @@ -205,7 +205,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { PingService pingService = dataSource.newPingService(); - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); if (!modelVersion.equals(modelServerVersion)) { ===================================== application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/filtered-resources/mapping +++ b/application-web/src/main/filtered-resources/mapping @@ -76,8 +76,8 @@ GET /api/v1/DataSourceService/migrateData GET /api/v1/DataSourceService/open v1.DataSourceServiceController.open GET /api/v1/LastUpdateDateService/updateDataLastUpdateDates v1.LastUpdateDateServiceController.updateDataLastUpdateDates GET /api/v1/LastUpdateDateService/updateReferentialLastUpdateDates v1.LastUpdateDateServiceController.updateReferentialLastUpdateDates +GET /api/v1/PingService/getModelVersion v1.PingServiceController.getModelVersion GET /api/v1/PingService/getServerVersion v1.PingServiceController.getServerVersion -GET /api/v1/PingService/ping v1.PingServiceController.ping GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getEnabledReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getEnabledReferentialReferenceSet GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getSourceReferentialStates v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceController.getSourceReferentialStates GET /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/filterIdsUsedInLocalSource v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceController.filterIdsUsedInLocalSource ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java @@ -35,7 +35,7 @@ import org.nuiton.version.Versions; public class PingServiceController extends ObserveWebMotionController implements PingService { @Override - public Version ping() { + public Version getModelVersion() { return getApplicationConfiguration().getModelVersion(); } ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java @@ -81,7 +81,7 @@ public class RestTestMethodResource extends TestMethodResourceSupport<RestTestCl PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); try { - Version serverVersion = service.ping(); + Version serverVersion = service.getModelVersion(); Version modelVersion = ObserveTestConfiguration.getModelVersion(); if (!serverVersion.equals(modelVersion)) { serverExist = false; ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java @@ -45,7 +45,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setServerUrl(new URL("http://fake_" + System.nanoTime())); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } @@ -57,7 +57,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setLogin("fake_" + System.nanoTime()); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -22,23 +22,22 @@ package fr.ird.observe.services.topia.service; * #L% */ -import com.google.common.base.Optional; -import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.util.Optional; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; /** * Created on 07/09/16. @@ -69,10 +68,10 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L private <E extends ObserveEntity> void updateLastUpdateDate(Class<E> entityType) { - Optional<LastUpdateDate> optionalLastUpdateDate = getTopiaPersistenceContext().getLastUpdateDateDao() + Optional<LastUpdateDate> optionalLastUpdateDate = Optional.ofNullable(getTopiaPersistenceContext().getLastUpdateDateDao() .forTypeEquals(entityType.getName()) .setOrderByArguments(LastUpdateDate.PROPERTY_LAST_UPDATE_DATE + " DESC") - .tryFindFirst(); + .tryFindFirst().orNull()); if (!optionalLastUpdateDate.isPresent()) { return; @@ -90,7 +89,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement("SELECT max(lastUpdateDate)::TIMESTAMP FROM " + schemaName + "." + tableName); + return connection.prepareStatement(String.format("SELECT max(lastUpdateDate)::TIMESTAMP FROM %s.%s", schemaName, tableName)); } @Override @@ -102,7 +101,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L if (maxLastUpdateDate != null && lastUpdateDate.getLastUpdateDate().before(maxLastUpdateDate)) { if (log.isInfoEnabled()) { - log.info("Update LastUpdateDate for " + entityType.getName() + " with value: " + maxLastUpdateDate); + log.info(String.format("Update LastUpdateDate for %s with value: %s", entityType.getName(), maxLastUpdateDate)); } lastUpdateDate.setLastUpdateDate(maxLastUpdateDate); } ===================================== services/src/main/java/fr/ird/observe/services/service/PingService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/PingService.java +++ b/services/src/main/java/fr/ird/observe/services/service/PingService.java @@ -34,7 +34,7 @@ import org.nuiton.version.Version; public interface PingService extends ObserveService { @NoDataAccess - Version ping(); + Version getModelVersion(); @NoDataAccess Version getServerVersion(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/02bf1386e0d2e83b28aa58208e2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/02bf1386e0d2e83b28aa58208e2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Rename ping method to getModelVersion + clean code
by Tony CHEMIT 05 Jul '17

05 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d83d499 by Tony CHEMIT at 2017-07-05T10:17:26+02:00 Rename ping method to getModelVersion + clean code - - - - - 7 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java - services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/PingService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -1701,7 +1701,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (!error) { - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); Version clientModelVersion = getModelVersion(); if (!Objects.equals(clientModelVersion, modelServerVersion)) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java @@ -205,7 +205,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { PingService pingService = dataSource.newPingService(); - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); if (!modelVersion.equals(modelServerVersion)) { ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java @@ -35,7 +35,7 @@ import org.nuiton.version.Versions; public class PingServiceController extends ObserveWebMotionController implements PingService { @Override - public Version ping() { + public Version getModelVersion() { return getApplicationConfiguration().getModelVersion(); } ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java @@ -81,7 +81,7 @@ public class RestTestMethodResource extends TestMethodResourceSupport<RestTestCl PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); try { - Version serverVersion = service.ping(); + Version serverVersion = service.getModelVersion(); Version modelVersion = ObserveTestConfiguration.getModelVersion(); if (!serverVersion.equals(modelVersion)) { serverExist = false; ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java @@ -45,7 +45,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setServerUrl(new URL("http://fake_" + System.nanoTime())); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } @@ -57,7 +57,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setLogin("fake_" + System.nanoTime()); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -22,23 +22,22 @@ package fr.ird.observe.services.topia.service; * #L% */ -import com.google.common.base.Optional; -import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.util.Optional; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; /** * Created on 07/09/16. @@ -69,10 +68,10 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L private <E extends ObserveEntity> void updateLastUpdateDate(Class<E> entityType) { - Optional<LastUpdateDate> optionalLastUpdateDate = getTopiaPersistenceContext().getLastUpdateDateDao() + Optional<LastUpdateDate> optionalLastUpdateDate = Optional.ofNullable(getTopiaPersistenceContext().getLastUpdateDateDao() .forTypeEquals(entityType.getName()) .setOrderByArguments(LastUpdateDate.PROPERTY_LAST_UPDATE_DATE + " DESC") - .tryFindFirst(); + .tryFindFirst().orNull()); if (!optionalLastUpdateDate.isPresent()) { return; @@ -90,7 +89,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement("SELECT max(lastUpdateDate)::TIMESTAMP FROM " + schemaName + "." + tableName); + return connection.prepareStatement(String.format("SELECT max(lastUpdateDate)::TIMESTAMP FROM %s.%s", schemaName, tableName)); } @Override @@ -102,7 +101,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L if (maxLastUpdateDate != null && lastUpdateDate.getLastUpdateDate().before(maxLastUpdateDate)) { if (log.isInfoEnabled()) { - log.info("Update LastUpdateDate for " + entityType.getName() + " with value: " + maxLastUpdateDate); + log.info(String.format("Update LastUpdateDate for %s with value: %s", entityType.getName(), maxLastUpdateDate)); } lastUpdateDate.setLastUpdateDate(maxLastUpdateDate); } ===================================== services/src/main/java/fr/ird/observe/services/service/PingService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/PingService.java +++ b/services/src/main/java/fr/ird/observe/services/service/PingService.java @@ -34,7 +34,7 @@ import org.nuiton.version.Version; public interface PingService extends ObserveService { @NoDataAccess - Version ping(); + Version getModelVersion(); @NoDataAccess Version getServerVersion(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d83d4994ee94d9ceca74ff80d9… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d83d4994ee94d9ceca74ff80d9… You're receiving this email because of your account on gitlab.com.

1 0