This is an automated email from the git hooks/post-receive script. New commit to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1e828f883aa1c6d40659bc3a2f7fdaa1d5fcbe31 Merge: 857c8ac 9094028 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 12 11:04:45 2016 +0100 [jgitflow-maven-plugin]merging 'release/5.1.2' into 'master-5.x' application-swing-configuration/pom.xml | 2 +- .../src/main/config/ObserveSwingApplication.ini | 8 +++ ...pplication-swing-configuration_en_GB.properties | 1 + ...pplication-swing-configuration_es_ES.properties | 1 + ...pplication-swing-configuration_fr_FR.properties | 1 + application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../ui/actions/ImportStorageFromFileAction.java | 8 +++ .../swing/ui/actions/ShowConfigAction.java | 1 + .../application/swing/ui/admin/AdminUIModel.java | 6 +- .../swing/ui/admin/report/ReportModel.java | 3 +- .../list/impl/longline/TripLonglinesUIHandler.java | 13 ++-- .../list/impl/seine/TripSeinesUIHandler.java | 13 ++-- .../ui/content/open/ContentOpenableUIHandler.java | 15 +++++ .../swing/ui/storage/tabs/DataSelectionModel.java | 14 ++--- .../swing/ui/tree/ObserveTreeHelper.java | 5 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- .../v1/longline/TripLonglineServiceController.java | 6 +- .../v1/seine/TripSeineServiceController.java | 6 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- .../observe/ObserveTopiaApplicationContext.java | 12 ---- .../fr/ird/observe/ObserveTopiaConfiguration.java | 6 ++ .../entities/longline/TripLonglineTopiaDao.java | 4 +- .../observe/entities/seine/TripSeineTopiaDao.java | 4 +- pom.xml | 8 +-- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto/pom.xml | 2 +- ...ataReferenceSet.java => DataReferenceList.java} | 16 ++--- .../ird/observe/services/dto/DataReferenceSet.java | 6 +- .../services/dto}/ObserveBlobsContainer.java | 2 +- ...nceSet.java => ReferenceCollectionSupport.java} | 9 +-- .../dto/gson/ObserveBlobsContainerAdapter.java | 70 ++++++++++++++++++++++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 5 ++ ...tAdapter.java => DataReferenceListAdapter.java} | 16 +++-- .../gson/reference/DataReferenceSetAdapter.java | 8 ++- ...java => ReferenceCollectionSupportAdapter.java} | 18 +++--- .../reference/ReferentialReferenceSetAdapter.java | 8 ++- .../dto/referential/ReferentialReferenceSet.java | 10 ++-- services-rest/pom.xml | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 30 +++++----- .../seine/TripSeineGearUseServiceRestTest.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 6 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- .../services/topia/ObserveServiceTopia.java | 38 +++++++++--- .../service/ImportTripScriptTopiaSqlWork.java | 2 +- .../topia/service/ReferentialServiceTopia.java | 4 +- .../service/SqlScriptProducerServiceTopia.java | 2 +- .../topia/service/TripManagementServiceTopia.java | 2 +- .../service/longline/TripLonglineServiceTopia.java | 18 +++--- .../topia/service/seine/TripSeineServiceTopia.java | 12 ++-- .../service/TripManagementServiceTopiaTest.java | 5 +- .../service/seine/TripSeineServiceTopiaTest.java | 12 ++-- services/pom.xml | 2 +- .../service/AddSqlScriptProducerResult.java | 1 + .../service/longline/TripLonglineService.java | 6 +- .../services/service/seine/TripSeineService.java | 6 +- .../services/service/trip/ExportTripResult.java | 2 +- .../services/service/trip/ImportTripRequest.java | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 73 files changed, 329 insertions(+), 182 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.