This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 7b7da62 Problèmes lors de la synchro du référentiel de bases locales (Fixes #8853) new 25d6fb8 Problème d'interprétation de coordonnée en DMD par le widget (fixes #8860) new 1f3119f Classement des marées dans l'arbre (fixes #8861) new c95396f Impossible d'exporter des marées en mode serveur (Fixes #8862) new 5b96c24 Mémorisation du dernier dossier utilisé (Fixes #8864) new 15510ff Problème de chargement du fichier des talbeaux de synthèse (Fixes #8865) new 6caccbb [persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia (Fixes #8868) new 0af7509 [iso] différentes adaptations suite aux test en mode serveur new ec2f51d Report from v5 Merge branch 'feature/report_from_5' into develop new 23001bf [iso] fix rest tests The 9 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 23001bfb86e09aee20032679338561aa0c478826 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 12:54:06 2016 +0100 [iso] fix rest tests commit ec2f51d804f6dd7522c76f7063739b2fe5302f94 Merge: 7b7da62 0af7509 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 12:16:07 2016 +0100 Report from v5 Merge branch 'feature/report_from_5' into develop commit 0af7509b63bb0975ed89121692f4e3ecb442388c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 12:15:52 2016 +0100 [iso] différentes adaptations suite aux test en mode serveur commit 6caccbb0dbc4f4de227f4d527e052c2e6610b20a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 10:18:27 2016 +0100 [persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia (Fixes #8868) commit 15510ffba2edd15b75104a63a1c52e01e1822113 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 10:13:41 2016 +0100 Problème de chargement du fichier des talbeaux de synthèse (Fixes #8865) commit 5b96c2440679694b3881cc6af49b7a12e4483dd0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 10:12:42 2016 +0100 Mémorisation du dernier dossier utilisé (Fixes #8864) commit c95396f96f5dde1bd8ef00297418a0162d2862ff Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 10:08:23 2016 +0100 Impossible d'exporter des marées en mode serveur (Fixes #8862) commit 1f3119fd02fbf9d35ed25b3adb64f707deb4667b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 11 09:49:56 2016 +0100 Classement des marées dans l'arbre (fixes #8861) commit 25d6fb8ea6da4433f9d31189ce02472e814e46a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 10 17:29:36 2016 +0100 Problème d'interprétation de coordonnée en DMD par le widget (fixes #8860) Summary of changes: .../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 + .../ui/actions/menu/config/ShowConfigAction.java | 1 + .../menu/storage/ImportStorageFromFileAction.java | 11 ++++- .../swing/ui/admin/config/SelectDataModel.java | 6 +-- .../swing/ui/admin/export/ExportUIHandler.java | 5 +- .../swing/ui/admin/report/ReportModel.java | 4 +- .../swing/ui/storage/StorageUILauncher.java | 6 +-- .../longline/TripLonglineServiceController.java | 6 +-- .../v1/data/seine/TripSeineServiceController.java | 6 +-- .../DataSourceMigrationForVersion_6_0.java | 2 +- .../observe/ObserveTopiaApplicationContext.java | 16 +----- .../fr/ird/observe/ObserveTopiaConfiguration.java | 10 ++-- pom.xml | 4 +- .../dto/gson/ArrayListMultimapAdapter.java | 20 ++++---- .../services/dto/gson/ImmutableMapAdapter.java | 11 +---- .../dto/gson/ImmutableMultimapAdapter.java | 11 +---- .../services/dto/gson/ImmutableSetAdapter.java | 6 ++- ...MapAdapter.java => MultimapAdapterSupport.java} | 32 +++++++----- .../dto/gson/ObserveBlobsContainerAdapter.java | 42 ++++++++++++++++ .../services/dto/gson/ObserveDtoGsonSupplier.java | 23 ++++++++- .../services/dto/gson/SetMultimapAdapter.java | 21 ++++---- ...tAdapter.java => DataReferenceListAdapter.java} | 16 ++++-- .../gson/reference/DataReferenceSetAdapter.java | 8 ++- ...java => ReferenceCollectionSupportAdapter.java} | 18 ++++--- .../reference/ReferentialReferenceSetAdapter.java | 8 ++- ...ataReferenceSet.java => DataReferenceList.java} | 16 +++--- .../ird/observe/services/dto/DataReferenceSet.java | 2 +- .../services/dto}/ObserveBlobsContainer.java | 2 +- ...nceSet.java => ReferenceCollectionSupport.java} | 10 ++-- .../dto/referential/LengthLengthParameterDto.java | 10 ++-- .../dto/referential/LengthWeightParameterDto.java | 10 ++-- .../dto/referential/ReferentialMultimap.java | 16 +++--- .../dto/referential/ReferentialReferenceSet.java | 10 ++-- .../services/rest/http/ObserveResponseBuilder.java | 29 ++++++----- .../services/rest/RestTestMethodResource.java | 2 +- .../rest/service/AbstractServiceRestTest.java | 8 +-- .../seine/TripSeineGearUseServiceRestTest.java | 6 +-- .../service/seine/TripSeineServiceRestTest.java | 6 +-- .../topia/binder/data/DataBinderSupport.java | 2 +- .../services/topia/ObserveServiceTopia.java | 26 ++++++++-- .../service/data/ImportTripScriptTopiaSqlWork.java | 2 +- .../topia/service/data/NavigationServiceTopia.java | 13 +++-- .../service/data/TripManagementServiceTopia.java | 2 +- .../data/longline/TripLonglineServiceTopia.java | 21 ++++---- .../service/data/seine/TripSeineServiceTopia.java | 15 +++--- .../referential/ReferentialServiceTopia.java | 12 ++--- .../service/sql/SqlScriptProducerServiceTopia.java | 2 +- .../services/topia/binder/BinderEngineTest.java | 2 +- .../data/TripManagementServiceTopiaTest.java | 6 +-- .../data/seine/TripSeineServiceTopiaTest.java | 6 +-- .../services/service/data/ExportTripResult.java | 2 +- .../services/service/data/ImportTripRequest.java | 2 +- .../services/service/data/NavigationRequest.java | 4 +- .../services/service/data/NavigationResult.java | 10 ++-- .../service/data/longline/TripLonglineService.java | 7 +-- .../service/data/seine/TripSeineService.java | 7 +-- .../service/sql/AddSqlScriptProducerResult.java | 1 + .../ird/observe/test/ObserveTestConfiguration.java | 57 ++++++---------------- .../ird/observe/test/TestClassResourceSupport.java | 22 +++++++-- .../observe/test/TestMethodResourceSupport.java | 25 +++++++--- ...n.java => DatabaseServerNameConfiguration.java} | 6 +-- test/src/main/resources/observetest.properties | 1 + 65 files changed, 396 insertions(+), 288 deletions(-) copy services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java => services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java (73%) copy services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/{ImmutableMapAdapter.java => MultimapAdapterSupport.java} (59%) create mode 100644 services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java copy services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java => services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java (71%) copy services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/{DataReferenceSetAdapter.java => DataReferenceListAdapter.java} (71%) rename services-dto-gson/src/main/java/fr/ird/observe/services/dto/gson/reference/{AbstractReferenceSetAdapter.java => ReferenceCollectionSupportAdapter.java} (73%) copy services-dto/src/main/java/fr/ird/observe/services/dto/{DataReferenceSet.java => DataReferenceList.java} (62%) rename {services/src/main/java/fr/ird/observe/services/service/sql => services-dto/src/main/java/fr/ird/observe/services/dto}/ObserveBlobsContainer.java (97%) rename services-dto/src/main/java/fr/ird/observe/services/dto/{AbstractReferenceSet.java => ReferenceCollectionSupport.java} (82%) copy test/src/main/java/fr/ird/observe/test/spi/{DatabaseUrlConfiguration.java => DatabaseServerNameConfiguration.java} (87%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.