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

[Git][ultreiaio/ird-observe] Deleted branch release/7.0-RC-2
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT deleted branch release/7.0-RC-2 at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 53 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-2-SNAPSHOT development
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: dfd53a62 by Tony CHEMIT at 2017-06-20T20:26:36+02:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-2-SNAPSHOT development - - - - - ee8babd9 by Tony CHEMIT at 2017-06-20T20:32:45+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - f6f8bb78 by Tony CHEMIT at 2017-06-20T20:32:46+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - fa224e59 by Tony CHEMIT at 2017-06-20T20:32:46+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - e933dd4c by Tony CHEMIT at 2017-06-20T20:49:53+02:00 Update changelog after stage of milestone 7.0-RC-1 - - - - - 8f60cc5f by Tony CHEMIT at 2017-06-21T06:27:47+00:00 Update CHANGELOG.md - - - - - 5650eb0a by Tony CHEMIT at 2017-06-30T12:14:39+02:00 Utilisation d'un modèle textuel pour le developpement (See #786) - - - - - 75e8d559 by Tony CHEMIT at 2017-06-30T12:14:45+02:00 use last pom version + clean poms - - - - - bb5030cb by Tony CHEMIT at 2017-06-30T12:19:42+02:00 Utilisation d'un modèle textuel pour le developpement (See #786) (mise en documentation des modèles zargo) - - - - - 592f734f by Tony CHEMIT at 2017-07-01T11:57:34+02:00 fix site build - - - - - 8ba9dd89 by Tony CHEMIT at 2017-07-01T11:57:42+02:00 L'application reste en espagnol après redémarrage (See #710) - - - - - 683c9790 by Tony CHEMIT at 2017-07-01T11:57:42+02:00 Gestion des objets flottants de référence (See #787) - - - - - 3f679de1 by Tony CHEMIT at 2017-07-01T11:57:42+02:00 Suppression de la table observe_longline.sizemeasuretype ? (See #780) - - - - - fe85c9d5 by Tony CHEMIT at 2017-07-01T12:48:29+02:00 Improve model (remove skip on constants enumeration) - - - - - fa5f909c by Tony CHEMIT at 2017-07-01T18:45:25+02:00 Adaptation pour le nouveau formulaire DPC (See #577) - - - - - e99890d3 by Tony CHEMIT at 2017-07-02T13:50:01+02:00 add contribution guide to add a referential [skip ci] - - - - - 57b3dc7f by Tony CHEMIT at 2017-07-05T00:07:39+02:00 Vérifier la parfaite adéquation version serveur / version client (see #703) - - - - - 02bf1386 by Tony CHEMIT at 2017-07-05T10:19:21+02:00 Rename ping method to getModelVersion + clean code - - - - - 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 - - - - - ef73fadf by Tony CHEMIT at 2017-07-06T10:21:04+02:00 use last release of eugene - - - - - f7d84062 by Tony CHEMIT at 2017-07-06T18:18:41+02:00 add missing license headers - - - - - d81a87ad by Tony CHEMIT at 2017-07-09T02:19:51+02:00 Ajout d'un traducteur dans l'application (See #788) - - - - - 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) - - - - - c8ca2479 by Tony CHEMIT at 2017-07-10T14:51:04+02:00 Mise à jour des librairies (Closes #790) - - - - - 36b0c6bc by Tony CHEMIT at 2017-07-10T15:48:14+02:00 Utilisation des templates dans le répertoires des ressources (Closes #791) - - - - - 55d1f127 by Tony CHEMIT at 2017-07-10T15:55:03+02:00 do not execute tests on regular build - - - - - 03ca7425 by Tony CHEMIT at 2017-07-10T16:48:14+02:00 Mise à jour des librairies (Closes #790) (retour sur yamlbeans qui ne fonctionne toujours pas en version audessus de la 1.08... - - - - - 4e0f3a1e by Tony CHEMIT at 2017-07-10T16:49:04+02:00 Utilisation des templates dans le répertoires des ressources (Closes #791) - - - - - e6fbec99 by Tony CHEMIT at 2017-07-10T19:38:48+02:00 Régression dur l'écran de configuration (See #789) - - - - - 12f75a5c by Tony CHEMIT at 2017-07-10T20:21:04+02:00 Limiter le Zoom- de la carte (See #642) - - - - - 9d402b83 by Tony CHEMIT at 2017-07-12T00:29:05+02:00 Consolidation des traductions (Closes #792) - - - - - 67c15827 by Tony CHEMIT at 2017-07-12T02:52:44+02:00 Consolidation des traductions (convergence - intégrité) (See #792) - - - - - 8bc23333 by Tony CHEMIT at 2017-07-12T14:04:51+02:00 Ajout d'un traducteur dans l'application (See #788) (consolidation intégrité bundles + intégration des modifications dans l'application) - - - - - f91e98c9 by Tony CHEMIT at 2017-07-12T21:58:31+02:00 create ftl if not exists (for tets purpose only) - - - - - a604a5de by Tony CHEMIT at 2017-07-16T22:34:27+02:00 Correction validation sur WeightCategory (le code n'est pas unique) - - - - - 6414b4df by Tony CHEMIT at 2017-07-16T22:34:51+02:00 Correction du validateur de code (on s'arrête à la première erreur rencontrée) - - - - - c56a2716 by Tony CHEMIT at 2017-07-16T23:13:48+02:00 Remplacer le client REST proxy par des services générés (See #776) - - - - - da4d7785 by Tony Chemit at 2017-07-18T16:00:24+02:00 Add maven best config - - - - - 80fcfee9 by Tony Chemit at 2017-07-18T16:04:14+02:00 Update some libraries - - - - - caf7b294 by Tony Chemit at 2017-07-18T23:53:38+02:00 Review design of ReferenceSetDefinition and FormRequestDefinition (Closes #793) - - - - - f3212497 by Tony Chemit at 2017-07-19T00:04:41+02:00 Fix pom version - - - - - 69b0281e by Tony Chemit at 2017-07-19T01:32:03+02:00 Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793) - - - - - 34740916 by Tony Chemit at 2017-07-19T01:40:13+02:00 optimize dependencies - - - - - 9ec91009 by Tony Chemit at 2017-07-19T01:41:56+02:00 Optimize license headers - - - - - 5d88185a by Tony Chemit at 2017-07-19T02:00:24+02:00 improve site build [skip ci] - - - - - 010f9e17 by Tony Chemit at 2017-07-19T02:12:24+02:00 Use http 1.0.1 - - - - - cdbcf0be by Tony CHEMIT at 2017-07-19T13:52:19+02:00 Ready to next release - - - - - 2a50ac8c by Tony CHEMIT at 2017-07-25T11:11:10+02:00 Mieux filtrer les espèces sensibles (See #794) - - - - - 7db715e9 by Tony CHEMIT at 2017-07-25T11:12:55+02:00 update library flexmark version - - - - - 19de1e1f by 166231 at 2017-07-25T09:35:30+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-2 branch with snapshot versions[skip ci] - - - - - 8d847ecb by 166231 at 2017-07-25T09:35:49+00:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-2' with non-snapshot versions[skip ci] - - - - - a57fccf3 by 166231 at 2017-07-25T09:48:08+00:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-2' into 'master'[skip ci] - - - - - 30 changed files: - .gitlab-ci.yml - + .mvn/jvm.config - + .mvn/maven.config - CHANGELOG.md - CONTRIBUTING.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/pom.xml - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties - application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties - application-swing-validation/pom.xml - application-swing-validation/src/main/java/fr/ird/observe/application/swing/validators/ReferentialCodeValidator.java - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-create-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-create-warning-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-update-error-validation.xml - + application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectMaterialTypeDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - application-swing-validation/src/test/java/fr/ird/observe/application/swing/validation/BeanValidatorDetectorTest.java - application-swing/pom.xml - application-swing/src/main/assembly/i18n.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/653b45f4cb9956fb4c685f9f19… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/653b45f4cb9956fb4c685f9f19… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0-RC-2
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed new tag v7.0-RC-2 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0-RC-2 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-2 branch with snapshot versions[skip ci]
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 19de1e1f by 166231 at 2017-07-25T09:35:30+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-2 branch with snapshot versions[skip ci] - - - - - 8d847ecb by 166231 at 2017-07-25T09:35:49+00:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-2' with non-snapshot versions[skip ci] - - - - - a57fccf3 by 166231 at 2017-07-25T09:48:08+00:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-2' into 'master'[skip ci] - - - - - c34e737e by 166231 at 2017-07-25T09:48:16+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7f38b069 by 166231 at 2017-07-25T09:48:17+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop'[skip ci] - - - - - 952bbd4b by 166231 at 2017-07-25T09:48:18+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6a0461201ac179c3d8e1c8e00… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e6a0461201ac179c3d8e1c8e00… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 7.0-RC-3-SNAPSHOT development[skip ci]
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e6a04612 by 166231 at 2017-07-25T09:35:31+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-3-SNAPSHOT development[skip ci] - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> @@ -183,10 +183,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version"/> + <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="*.model"/> + <include name="*.model" /> </fileset> </copy> </target> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -32,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services</artifactId> @@ -140,10 +140,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version"/> + <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="*.model"/> + <include name="*.model" /> </fileset> </copy> </target> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6a0461201ac179c3d8e1c8e00d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6a0461201ac179c3d8e1c8e00d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-2
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed new branch release/7.0-RC-2 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0-RC-2 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mieux filtrer les espèces sensibles (See #794)
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2a50ac8c by Tony CHEMIT at 2017-07-25T11:11:10+02:00 Mieux filtrer les espèces sensibles (See #794) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java - application-web/src/main/filtered-resources/mapping - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java @@ -45,11 +45,9 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseStatusDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseHelper; import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; -import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import fr.ird.observe.services.service.referential.ReferentialService; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -59,7 +57,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.TreeMap; -import java.util.stream.Collectors; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JPopupMenu; @@ -111,7 +108,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei private void updateSpecies(ReferentialReference<SpeciesDto> species, List<NonTargetCatchReleaseStatusDto> states) { - ReferentialReference<SpeciesDto> oldSpecies = getTableEditBean().getSpecies(); JPanel statesContent = getUi().getStatesContent(); statesContent.removeAll(); @@ -205,24 +201,17 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei bean.removePropertyChangeListener(NonTargetCatchReleaseDto.PROPERTY_SPECIES, speciesChanged); bean.addPropertyChangeListener(NonTargetCatchReleaseDto.PROPERTY_SPECIES, speciesChanged); - log.info("Focus to "+requestFocus.getName()); + log.info("Focus to " + requestFocus.getName()); UIHelper.askFocus(requestFocus); } - private static final List<String> SPECIES_GROUP_IDS = Arrays.asList( - "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" - ); - @Override public void afterInit(NonTargetCatchReleaseUI ui) { super.afterInit(ui); speciesGroupDtoMap = new TreeMap<>(); - SPECIES_GROUP_IDS.forEach(id -> speciesGroupDtoMap.put(id, getReferentialService().loadSpeciesGroup(id))); + getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id)); ui.getDetectionTime().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); ui.getReleaseTime().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); @@ -303,9 +292,9 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei case NonTargetCatchReleaseDto.PROPERTY_SPECIES: { - Collection<ReferentialReference<SpeciesDto>> sampleSpecies = getNonTargetSampleService().getSampleSpecies(getSelectedParentId()); + Collection<ReferentialReference<SpeciesDto>> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId()); - result = (Collection) sampleSpecies.stream().filter(s -> SPECIES_GROUP_IDS.contains(s.getPropertyValue(SpeciesDto.PROPERTY_SPECIES_GROUP + "Id"))).collect(Collectors.toList()); + result = new LinkedList(sampleSpecies); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); @@ -329,10 +318,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newReferentialService(); } - private NonTargetSampleService getNonTargetSampleService() { - return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newNonTargetSampleService(); - } - public void moveCatchLonglineUp() { int selectedRow = getUi().getTable().getSelectedRow(); getTableModel().moveUp(selectedRow); ===================================== application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/filtered-resources/mapping +++ b/application-web/src/main/filtered-resources/mapping @@ -163,6 +163,7 @@ GET /api/v1/data/seine/FloatingObjectService/loadReferenceToRead GET /api/v1/data/seine/FloatingObjectService/preCreate v1.data.seine.FloatingObjectServiceRestApi.preCreate POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save +GET /api/v1/data/seine/NonTargetCatchReleaseService/getSampleSpecies v1.data.seine.NonTargetCatchReleaseServiceRestApi.getSampleSpecies GET /api/v1/data/seine/NonTargetCatchReleaseService/loadForm v1.data.seine.NonTargetCatchReleaseServiceRestApi.loadForm POST /api/v1/data/seine/NonTargetCatchReleaseService/save v1.data.seine.NonTargetCatchReleaseServiceRestApi.save GET /api/v1/data/seine/NonTargetCatchService/loadForm v1.data.seine.NonTargetCatchServiceRestApi.loadForm @@ -229,6 +230,7 @@ GET /api/v1/referential/ReferentialService/getReferentialReferenceSets POST /api/v1/referential/ReferentialService/insertMissingReferentials v1.referential.ReferentialServiceRestApi.insertMissingReferentials GET /api/v1/referential/ReferentialService/loadForm v1.referential.ReferentialServiceRestApi.loadForm GET /api/v1/referential/ReferentialService/loadReference v1.referential.ReferentialServiceRestApi.loadReference +GET /api/v1/referential/ReferentialService/loadSensibleSpeciesGroup v1.referential.ReferentialServiceRestApi.loadSensibleSpeciesGroup GET /api/v1/referential/ReferentialService/loadSpecies v1.referential.ReferentialServiceRestApi.loadSpecies GET /api/v1/referential/ReferentialService/loadSpeciesGroup v1.referential.ReferentialServiceRestApi.loadSpeciesGroup GET /api/v1/referential/ReferentialService/preCreate v1.referential.ReferentialServiceRestApi.preCreate ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java @@ -22,12 +22,22 @@ package fr.ird.observe.services.topia.service.data.seine; * #L% */ +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.service.referential.ReferentialServiceTopia; +import java.util.Collection; +import java.util.stream.Collectors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,6 +49,26 @@ public class NonTargetCatchReleaseServiceTopia extends ObserveServiceTopia imple private static final Log log = LogFactory.getLog(NonTargetCatchReleaseServiceTopia.class); @Override + public Collection<ReferentialReference<SpeciesDto>> getSampleSpecies(String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("getSampleSpecies(" + setSeineId + ")"); + } + + SetSeine setSeine = loadEntity(SetSeineDto.class, setSeineId); + + ReferentialBinderSupport<ObserveReferentialEntity, SpeciesDto> speciesBinder = getReferentialBinder(SpeciesDto.class); + + ReferentialLocale referentialLocale = getReferentialLocale(); + + return setSeine.getNonTargetCatch().stream() + .map(NonTargetCatch::getSpecies) + .distinct() + .filter(s-> ReferentialServiceTopia.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) + .map(s -> speciesBinder.toReferentialReference(referentialLocale, s)) + .collect(Collectors.toList()); + } + + @Override public Form<SetSeineNonTargetCatchReleaseDto> loadForm(String setSeineId) { if (log.isTraceEnabled()) { log.trace("loadForm(" + setSeineId + ")"); ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -61,6 +61,7 @@ import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -82,6 +83,12 @@ import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; public class ReferentialServiceTopia extends ObserveServiceTopia implements ReferentialService { private static final Log log = LogFactory.getLog(ReferentialServiceTopia.class); + public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( + "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" + ); @Override public <D extends ReferentialDto> ReferentialReferenceSet<D> getReferenceSet(Class<D> type, Date lastUpdateDate) { @@ -161,6 +168,20 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override + public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() { + if (log.isTraceEnabled()) { + log.trace("loadSensibleSpeciesGroup()"); + } + + ImmutableSet.Builder<SpeciesGroupDto> result = ImmutableSet.builder(); + + for (String speciesGroupId : SPECIES_GROUP_IDS) { + result.add(loadSpeciesGroup(speciesGroupId)); + } + return result.build(); + } + + @Override public <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id) { if (log.isTraceEnabled()) { log.trace("loadForm(" + type.getName() + ", " + id + ")"); ===================================== services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java @@ -22,6 +22,8 @@ package fr.ird.observe.services.service.data.seine; * #L% */ +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -31,6 +33,7 @@ import io.ultreia.java4all.http.spi.Post; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; +import java.util.Collection; /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com @@ -39,6 +42,10 @@ public interface NonTargetCatchReleaseService extends ObserveService { @Get @ReadDataPermission + Collection<ReferentialReference<SpeciesDto>> getSampleSpecies(String setSeineId); + + @Get + @ReadDataPermission Form<SetSeineNonTargetCatchReleaseDto> loadForm(String setSeineId); @Write ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java @@ -72,6 +72,10 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @Get + ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup(); + + @ReadReferentialPermission + @Get <R extends ReferentialDto> Form<R> loadForm(Class<R> type, String id) throws DataNotFoundException; @Get View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2a50ac8c34d6330e1ac011a272e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2a50ac8c34d6330e1ac011a272e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update library flexmark version
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7db715e9 by Tony CHEMIT at 2017-07-25T11:12:55+02:00 update library flexmark version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> <httpVersion>1.0.1</httpVersion> <xworkVersion>2.3.33</xworkVersion> - <flexmarkVersion>0.22.8</flexmarkVersion> + <flexmarkVersion>0.22.14</flexmarkVersion> <hibernateVersion>5.1.8.Final</hibernateVersion> <sl4jVersion>1.7.25</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7db715e98330c7641ab4888518d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7db715e98330c7641ab4888518d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ready to next release
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cdbcf0be by Tony CHEMIT at 2017-07-19T13:52:19+02:00 Ready to next release - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>15</version> + <version>16</version> </parent> <groupId>fr.ird.observe</groupId> @@ -174,8 +174,8 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-8-SNAPSHOT</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-3-SNAPSHOT</nuitonI18nVersion> + <jaxxVersion>3.0-alpha-8</jaxxVersion> + <nuitonI18nVersion>4.0-alpha-3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -393,16 +393,6 @@ <artifactId>i18n-editor</artifactId> <version>${nuitonI18nVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets-file</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -417,12 +407,6 @@ <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>io.ultreia.java4all.jaxx</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdbcf0bebd131dcba72c9cf9cfa… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdbcf0bebd131dcba72c9cf9cfa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use http 1.0.1
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 010f9e17 by Tony Chemit at 2017-07-19T02:12:24+02:00 Use http 1.0.1 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> - <httpVersion>1.0.1-SNAPSHOT</httpVersion> + <httpVersion>1.0.1</httpVersion> <xworkVersion>2.3.33</xworkVersion> <flexmarkVersion>0.22.8</flexmarkVersion> <hibernateVersion>5.1.8.Final</hibernateVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/010f9e171904cdd2a72d80f3123… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/010f9e171904cdd2a72d80f3123… You're receiving this email because of your account on gitlab.com.

1 0