This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 8bffed8 [jgitflow-maven-plugin]merging 'release/5.0-RC-3' into 'master' adds ee8e5a5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e42f35a [jgitflow-maven-plugin]merging 'master' into 'develop' adds 312d797 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds e7d038d Corrige l'export des données observateurs en serveur distant adds 24e81eb improve configuration in web application (only one page) + improve mapping adds 4219603 Fix legacy synchronization always play insert, then update and finally delete request in this order + begin de fix fixes... adds 54d5596 Remove some fixes adds 9ce64eb Prefer to add specific order in sql clause adds 60f081c Freeze database model version adds 96bd942 Fix mapping adds 263d649 Use exactly columns we are owing, skip other ones detected in databases + add test for TripManagementService adds 6132553 Corrige les libellés de validation non traduits adds ade1cba Mieux gérer les associations pour la réplication adds a6fd937 Corrige la traduction du chaine i18n adds bd8edb8 Corrige une tipo adds 014ac30 Remove dead code adds 76c51a4 Test d'ajout de raccourcis clavier adds d6f1f1c Corrige une chaine i18n concernant le nombre de paniers adds acfd723 Adding functional tests into the project documentation adds cfa7b2a Ajoute une dépendance vers guava dans topia template extension pour corriger le build adds ee0e6e6 Change log levels adds 2678091 Block actions if not on correct tab adds 04a0621 Use eugene 3.0-alpha-6 and use new compact format adds f8c2849 Correction de la condition empty, on sauvait des enregistrement avec des valeurs nulles (See #8534) adds fb99f0e Clean code adds 34c54e4 Tri des listes de référence selon le code si possible (See #8538) adds ff8b4e7 Specialize trads (See #8538) adds d94c4e5 Tri des listes de référence aussi dans les autres cas via decorateur (See #8538) adds 3aea7d8 Fixes #8538 Merge branch 'feature/8538' into develop adds f639020 Utilisation des nouvelles api http commons + un peu de ménage par ci par là adds c71a8cb Fix build adds 474fa6d Regroupement de petits défauts sur les messages (Fixes #8535) adds 3e852e9 [jgitflow-maven-plugin]updating poms for 5.0 branch with snapshot versions adds a40db75 [jgitflow-maven-plugin]updating poms for branch'release/5.0' with non-snapshot versions adds 2f84c02 Add missing license headers adds 6fbf325 [jgitflow-maven-plugin]merging 'release/5.0' into 'master' No new revisions were added by this update. Summary of changes: application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- .../swing/decoration/DecoratorService.java | 2 + .../application-swing-decoration_en_GB.properties | 8 +- .../application-swing-decoration_es_ES.properties | 8 +- .../application-swing-decoration_fr_FR.properties | 8 +- application-swing-validation/pom.xml | 2 +- .../application-swing-validation_fr_FR.properties | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- .../swing/ObserveSwingApplicationContext.java | 11 +- .../swing/db/ObserveSwingDataSource.java | 39 +-- .../swing/ui/admin/save/SaveLocalUIHandler.java | 2 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 4 - .../referential/legacy/SynchronizeUIHandler.java | 9 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 61 +++- .../ui/content/impl/seine/FloatingObjectUI.jcss | 2 +- .../swing/ui/content/impl/seine/SetSeineUI.jcss | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 50 +-- .../content/table/impl/seine/AbstractSampleUI.jcss | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 47 ++- .../table/impl/seine/NonTargetSampleUI.jcss | 2 +- .../content/table/impl/seine/TargetSampleUI.jcss | 2 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 91 +++++- .../i18n/application-swing_fr_FR.properties | 12 +- ...glineDetailCompositionValidatorServiceTest.java | 3 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 19 +- .../web/ObserveWebApplicationContext.java | 3 +- .../web/ObserveWebApplicationListener.java | 3 +- .../{v1 => }/ConfigurationController.java | 102 +++--- ...r.java => LastUpdateDateServiceController.java} | 26 +- ...ferentialSynchronizeLocalServiceController.java | 5 + application-web/src/main/resources/mapping | 354 ++++++++++----------- .../4.1/observe-actions-v4.1.ods | Bin 0 -> 34652 bytes doc/tests_fonctionnels/4.1/observe-ecrans-v4.1.ods | Bin 0 -> 97571 bytes .../4.1/observe-sources-donnees-v4.1.ods | Bin 0 -> 27498 bytes .../5.0/observe-actions-v5.0.ods | Bin 0 -> 42800 bytes .../5.0/observe-ecrans-v5.0-local.ods | Bin 0 -> 107069 bytes .../5.0/observe-ecrans-v5.0-serveur.ods | Bin 0 -> 102256 bytes .../5.0/observe-sources-donnees-v5.0.ods | Bin 0 -> 33257 bytes entities-migration/pom.xml | 2 +- .../ObserveMigrationConfigurationProviderImpl.java | 4 +- entities/pom.xml | 136 +++----- entities/src/main/xmi/observe-common.properties | 87 ----- entities/src/main/xmi/observe-longline.properties | 161 ---------- entities/src/main/xmi/observe-seine.properties | 155 --------- entities/src/main/xmi/observe.objectmodel-ext | 248 +++++++++++++++ pom.xml | 7 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- .../configuration/ObserveDataSourceConnection.java | 1 - services-dto/pom.xml | 18 +- .../GearUseFeaturesMeasurementLonglineDto.java | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 1 - .../request/ReferenceSetRequestDefinitions.java | 1 - .../dto/referential/ReferentialReference.java | 4 + .../seine/GearUseFeaturesMeasurementSeineDto.java | 2 +- .../xmi/observe-services-dto-common.properties | 52 --- .../xmi/observe-services-dto-longline.properties | 123 ------- .../main/xmi/observe-services-dto-seine.properties | 94 ------ .../main/xmi/observe-services-dto.objectmodel-ext | 216 +++++++++++++ services-rest/pom.xml | 2 +- .../services/rest/ObserveServiceFactoryRest.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 97 +++--- .../services/rest/RestTestClassResource.java | 3 +- .../services/rest/RestTestMethodResource.java | 6 - services-runner/pom.xml | 2 +- .../services/runner/ObserveServiceMainFactory.java | 37 +-- services-topia-validation/pom.xml | 2 +- ...rvice-objectSchoolEstimate-error-validation.xml | 1 - .../services-topia-validation_fr_FR.properties | 2 +- services-topia-validators/pom.xml | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 4 - .../SetLonglineUniqueNumberValidator.java | 4 - services-topia/pom.xml | 2 +- .../observe/services/topia/ObserveJdbcHelper.java | 2 - .../services/topia/ObserveSecurityHelper.java | 2 - .../services/topia/ObserveServiceContextTopia.java | 1 - .../services/topia/ObserveServiceTopia.java | 100 +----- .../topia/service/DataSourceServiceTopia.java | 5 + .../topia/service/LastUpdateDateServiceTopia.java | 110 +++++++ .../topia/service/ReferentialServiceTopia.java | 15 +- .../service/SqlScriptProducerServiceTopia.java | 13 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 21 +- .../actions/validate/ValidateServiceTopia.java | 5 +- .../ActivityLongLineEncounterServiceTopia.java | 3 +- .../ActivityLongLineSensorUsedServiceTopia.java | 3 +- .../longline/ActivityLonglineServiceTopia.java | 4 +- .../longline/SetLonglineCatchServiceTopia.java | 3 +- .../SetLonglineDetailCompositionServiceTopia.java | 4 +- .../SetLonglineGlobalCompositionServiceTopia.java | 3 +- .../service/longline/SetLonglineServiceTopia.java | 4 +- .../topia/service/longline/TdrServiceTopia.java | 3 +- .../longline/TripLonglineGearUseServiceTopia.java | 4 +- .../service/longline/TripLonglineServiceTopia.java | 4 +- .../ActivitySeineObservedSystemServiceTopia.java | 3 +- .../service/seine/ActivitySeineServiceTopia.java | 4 +- .../service/seine/FloatingObjectServiceTopia.java | 4 +- .../service/seine/NonTargetCatchServiceTopia.java | 4 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 3 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 3 +- .../topia/service/seine/RouteServiceTopia.java | 8 +- .../service/seine/SchoolEstimateServiceTopia.java | 4 +- .../topia/service/seine/SetSeineServiceTopia.java | 7 +- .../TransmittingBuoyOperationServiceTopia.java | 3 +- .../seine/TripSeineGearUseServiceTopia.java | 3 +- .../topia/service/seine/TripSeineServiceTopia.java | 3 +- .../services/topia/TopiaTestClassResource.java | 4 +- .../services/topia/TopiaTestMethodResource.java | 2 +- .../topia/entity/ReplicateTestSupport.java | 2 +- .../service/TripManagementServiceTopiaTest.java | 151 +++++++++ .../UnidirectionalSynchronizeReferentialTest.java | 32 +- .../seine/TargetSampleServiceTopiaTest.java | 16 - services-topia/src/test/resources/log4j.properties | 1 + services/pom.xml | 2 +- .../observe/services/ObserveServiceFactory.java | 3 +- .../services/ObserveServiceInitializer.java | 1 - .../observe/services/ObserveServicesProvider.java | 3 + ...PingService.java => LastUpdateDateService.java} | 15 +- .../services/service/ReferentialService.java | 1 - ...UnidirectionalReferentialSynchronizeEngine.java | 41 ++- ...ectionalReferentialSynchronizeLocalService.java | 5 + .../services/service/trip/DeleteTripRequest.java | 4 +- .../services/service/trip/DeleteTripResult.java | 4 +- .../services/service/trip/ExportTripRequest.java | 4 +- .../services/service/trip/ExportTripResult.java | 3 +- .../services/service/trip/ImportTripRequest.java | 3 +- .../services/service/trip/ImportTripResult.java | 4 +- test/pom.xml | 2 +- .../ird/observe/test/TestClassResourceSupport.java | 2 +- .../resources/db/5.0/dataForTestLongline.sql.gz | Bin 0 -> 1622126 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 0 -> 451053 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441245 bytes test/src/main/resources/db/5.0/empty_h2.sql.gz | Bin 0 -> 6016 bytes test/src/main/resources/db/5.0/empty_pg.sql.gz | Bin 0 -> 6006 bytes test/src/main/resources/db/5.0/referentiel.sql.gz | Bin 0 -> 140210 bytes toolbox-maven-plugin/pom.xml | 2 +- .../toolbox/GenerateWebmotionMappingMojo.java | 22 +- topia-extension/pom.xml | 2 +- .../persistence/metadata/TopiaMetadataEntity.java | 71 ++++- .../persistence/metadata/TopiaMetadataModel.java | 2 +- .../metadata/TopiaMetadataModelVisitor.java | 19 ++ .../topia/service/sql/batch/SqlRequests.java | 31 +- .../sql/batch/actions/AbstractSqlAction.java | 1 - .../sql/batch/actions/AbstractTablesAction.java | 38 ++- .../sql/batch/actions/DeleteTablesAction.java | 2 +- .../sql/batch/actions/ReplicateTablesAction.java | 21 +- .../sql/batch/actions/ReplicateTablesRequest.java | 12 + .../sql/batch/actions/UpdateTablesAction.java | 42 ++- .../sql/batch/actions/UpdateTablesRequest.java | 12 + .../service/sql/batch/tables/TopiaSqlTable.java | 16 +- .../service/sql/batch/tables/TopiaSqlTables.java | 15 +- .../sql/batch/tables/TopiaSqlTablesFactory.java | 5 + topia-templates-extension/pom.xml | 6 +- .../templates/TopiaMetadataModelGenerator.java | 133 ++------ 157 files changed, 1797 insertions(+), 1695 deletions(-) rename application-web/src/main/java/fr/ird/observe/application/web/controller/{v1 => }/ConfigurationController.java (63%) copy application-web/src/main/java/fr/ird/observe/application/web/controller/v1/{PingServiceController.java => LastUpdateDateServiceController.java} (59%) create mode 100644 doc/tests_fonctionnels/4.1/observe-actions-v4.1.ods create mode 100644 doc/tests_fonctionnels/4.1/observe-ecrans-v4.1.ods create mode 100644 doc/tests_fonctionnels/4.1/observe-sources-donnees-v4.1.ods create mode 100644 doc/tests_fonctionnels/5.0/observe-actions-v5.0.ods create mode 100644 doc/tests_fonctionnels/5.0/observe-ecrans-v5.0-local.ods create mode 100644 doc/tests_fonctionnels/5.0/observe-ecrans-v5.0-serveur.ods create mode 100644 doc/tests_fonctionnels/5.0/observe-sources-donnees-v5.0.ods delete mode 100644 entities/src/main/xmi/observe-common.properties delete mode 100644 entities/src/main/xmi/observe-longline.properties delete mode 100644 entities/src/main/xmi/observe-seine.properties create mode 100644 entities/src/main/xmi/observe.objectmodel-ext delete mode 100644 services-dto/src/main/xmi/observe-services-dto-common.properties delete mode 100644 services-dto/src/main/xmi/observe-services-dto-longline.properties delete mode 100644 services-dto/src/main/xmi/observe-services-dto-seine.properties create mode 100644 services-dto/src/main/xmi/observe-services-dto.objectmodel-ext create mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java create mode 100644 services-topia/src/test/java/fr/ird/observe/services/topia/service/TripManagementServiceTopiaTest.java copy services/src/main/java/fr/ird/observe/services/service/{PingService.java => LastUpdateDateService.java} (79%) create mode 100644 test/src/main/resources/db/5.0/dataForTestLongline.sql.gz create mode 100644 test/src/main/resources/db/5.0/dataForTestSeine.sql.gz create mode 100644 test/src/main/resources/db/5.0/dataForTestUnidirectionalReferentialSynchro.sql.gz create mode 100644 test/src/main/resources/db/5.0/empty_h2.sql.gz create mode 100644 test/src/main/resources/db/5.0/empty_pg.sql.gz create mode 100644 test/src/main/resources/db/5.0/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.