This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git 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 .../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(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.