This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 3c0bec6 Définir l'API des services (termine #7458) \o/ Merge branch 'feature/7458-LonglineTopiaService' into develop new ceead9a Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) new 1163ce4 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 new af84d4d Sérialiser les objets + quelques améliorations de code new 4c1bcb5 Déplacement de l'implantation du service de consolidation (See #7488) new 96578ad Ajout de décorateurs sur les entités new 6f72a08 Ajout d'un exception si la relation RTP n'est pas trouvée new 79bfa04 Ajout de la locale applicative (mais cela devra certainement être redescendu au niveau du service context) new 5e48a71 Ajout des résultats de l'action de consolidation des données de marée Seine (See #7488) new 0a38d0d Ajout et nettoyage des clefs sur le module de persistence new 41aebf8 Revue des logs et ajout d'un test sur le service (See #7488) new 819491b Nouvelle implantation du service de consolidation des données (termine #7488) Merge branch 'feature/7488' into develop The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 819491b546b0acf55ecf805dc04e260039b4e57a Merge: 3c0bec6 41aebf8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 11:49:36 2015 +0200 Nouvelle implantation du service de consolidation des données (termine #7488) Merge branch 'feature/7488' into develop commit 41aebf8295434f06402d89137231ca794fab9c50 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 11:49:18 2015 +0200 Revue des logs et ajout d'un test sur le service (See #7488) commit 0a38d0d5f867d14fc2b4028d6e0833adae02fd0c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 11:35:43 2015 +0200 Ajout et nettoyage des clefs sur le module de persistence commit 5e48a71456549f04d9163766519eddc64f53855f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 10:47:46 2015 +0200 Ajout des résultats de l'action de consolidation des données de marée Seine (See #7488) commit 79bfa048ccd925f5db4847e14305978c879d2175 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 10:07:28 2015 +0200 Ajout de la locale applicative (mais cela devra certainement être redescendu au niveau du service context) commit 6f72a08c5233fc8bfbca6536c5566c62b6cd86d5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 10:05:54 2015 +0200 Ajout d'un exception si la relation RTP n'est pas trouvée commit 96578ad25d0a6ca99938db41d2c6b2f26a97dcea Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 10:05:37 2015 +0200 Ajout de décorateurs sur les entités commit 4c1bcb53528a8453c3c3a9a107f70930aab66920 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 08:26:13 2015 +0200 Déplacement de l'implantation du service de consolidation (See #7488) commit af84d4d7dd6194c15fa2a7ef0ffba82d08054fa1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 28 22:29:13 2015 +0200 Sérialiser les objets + quelques améliorations de code commit 1163ce4c15e14be824f5e42150c2891556e22e16 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 28 12:27:59 2015 +0200 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 commit ceead9a2c960628ade5b08f66bc2178574127af4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 28 12:27:27 2015 +0200 Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) Summary of changes: .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../entities/constants/seine/SchoolType.java | 6 +- .../seine/TypeTransmittingBuoyOperation.java | 10 +- .../DuplicateLengthWeightParameterException.java | 52 ++ .../referentiel/I18nReferenceEntities.java | 23 + .../LengthWeightParameterNotFoundException.java | 45 ++ ...eterHelper.java => LengthWeightParameters.java} | 229 +++++-- .../referentiel/LengthWeightParemeterHelper.java | 23 +- .../ird/observe/entities/referentiel/Species2.java | 25 + .../ird/observe/entities/seine/ActivitySeines.java | 9 + .../observe/entities/seine/NonTargetCatches.java | 16 + .../fr/ird/observe/entities/seine/SetSeines.java | 33 + .../fr/ird/observe/entities/seine/TripSeines.java | 28 + .../i18n/observe-entities_en_GB.properties | 23 +- .../i18n/observe-entities_es_ES.properties | 25 +- .../i18n/observe-entities_fr_FR.properties | 23 +- .../services/ObserveServiceApplicationContext.java | 15 + .../observe/services/ObserveServiceContext.java | 4 +- .../ConsolidateActivitySeineDataResult.java | 208 ++++++ .../ConsolidateTripSeineDataRequest.java | 44 ++ .../ConsolidateTripSeineDataResult.java | 52 ++ .../consolidate/ConsolidationDataService.java | 25 + observe-services-topia/pom.xml | 23 + .../services/ObserveServiceContextTopia.java | 6 + .../ConsolidateActivitySeineDataResultBuilder.java | 232 +++++++ .../consolidate/ConsolidationDataServiceTopia.java | 715 +++++++++++++++++++++ .../i18n/observe-services-topia_en_GB.properties | 2 + .../i18n/observe-services-topia_es_ES.properties | 2 + .../i18n/observe-services-topia_fr_FR.properties | 2 + .../services/ApplicationContextResource.java | 2 + .../ConsolidationDataServiceTopiaTest.java | 55 ++ 31 files changed, 1834 insertions(+), 129 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java copy observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{LengthWeightParemeterHelper.java => LengthWeightParameters.java} (58%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataService.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopia.java create mode 100644 observe-services-topia/src/main/resources/i18n/observe-services-topia_en_GB.properties create mode 100644 observe-services-topia/src/main/resources/i18n/observe-services-topia_es_ES.properties create mode 100644 observe-services-topia/src/main/resources/i18n/observe-services-topia_fr_FR.properties create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopiaTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.