August 2016 - Observe-commits - mailman.cloud.codelutin.com

branch develop updated (205fc78 -> a2adfbe)
by codelutin.com scm 27 Aug '16

27 Aug '16

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 205fc78 Merge branch 'feature/7498_selection_rapport_tableau_synthese' into 'develop' adds 38a6aa9 Corrige les erreurs liées à la sérialisation/deserialisation des objets adds a2adfbe Merge branch 'feature/4309_correction_synchro_ref_avancee_serveur_distant' into 'develop' No new revisions were added by this update. Summary of changes: .../diff/ReferentialSynchronizeDiffService.java | 1 + .../ng/ReferentialSynchronizeRequest.java | 9 ++--- ...entialSynchronizeServiceProduceSqlsRequest.java | 3 +- ...rentialSynchronizeServiceProduceSqlsResult.java | 4 ++- .../ng/ReferentialSynchronizeSqlsRequest.java | 3 +- ...pAdapter.java => ImmutableMultimapAdapter.java} | 38 ++++++++++++++++++---- .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 ++ 7 files changed, 46 insertions(+), 14 deletions(-) copy observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/{ImmutableMapAdapter.java => ImmutableMultimapAdapter.java} (56%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7498_selection_rapport_tableau_synthese deleted (was 464c328)
by codelutin.com scm 27 Aug '16

27 Aug '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7498_selection_rapport_tableau_synthese in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was 464c328 Corrige la selection de requete dans le tableau des rapports The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (5440aa2 -> 205fc78)
by codelutin.com scm 27 Aug '16

27 Aug '16

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 5440aa2 Merge branch 'feature/7493_doublons_messages_validation' into 'develop' adds 464c328 Corrige la selection de requete dans le tableau des rapports adds 205fc78 Merge branch 'feature/7498_selection_rapport_tableau_synthese' into 'develop' No new revisions were added by this update. Summary of changes: .../main/java/fr/ird/observe/ui/admin/report/ReportUIHandler.java | 7 ------- 1 file changed, 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7493_doublons_messages_validation deleted (was 89aaf3b)
by codelutin.com scm 27 Aug '16

27 Aug '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7493_doublons_messages_validation in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was 89aaf3b Dedoublonne les messages de validations The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (b62f5c6 -> 5440aa2)
by codelutin.com scm 27 Aug '16

27 Aug '16

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 b62f5c6 Merge branch 'feature/7493_corrige_action_validation_serveur_distant' into 'develop' adds 89aaf3b Dedoublonne les messages de validations adds 5440aa2 Merge branch 'feature/7493_doublons_messages_validation' into 'develop' No new revisions were added by this update. Summary of changes: .../actions/validate/ValidationMessageDetector.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7553_ajoute_un_widget_pour_les_arbres deleted (was 3ce195b)
by codelutin.com scm 27 Aug '16

27 Aug '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was 3ce195b Add tree header in other places in application The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7553_ajoute_un_widget_pour_les_arbres updated (ceac497 -> 3ce195b)
by codelutin.com scm 27 Aug '16

27 Aug '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git omits ceac497 Add tree header in other places in application omits 1b3452f Rename tree header id omits abffbce Be able to show or not actions (fold or select) of the tree header omits 408b37e Optimize css omits 24dad06 merge i18n omits b3fb781 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' omits 654b8a6 Ajoute le BeanTreeHeader au panneau de sélection des données omits e73f1bb Ajoute des icones sur les boutons du BeanTreeHeader omits a1edb9b Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler omits c96b601 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur adds 7507619 changement des loggeurs adds f2ef0f2 Ajouter l'heure dans les informations technique d'un référentiel adds 799b1c4 Ajout d'un FIXME qu'il faudrait mieux gérer adds e3e0875 Amélioration de gestion des associations dans les sql batch tables adds 573de56 Correction de la suppression des données adds eece9f6 Can use remote data source in simple referential synchro adds 9993341 Champs non binde :( adds a626ca7 Renommage méthode adds 32aa66b Utilisation d'un meilleur nom de rapport de validation adds 7df5e6a En fait pas besoin des droits en écriture pour l'action de validation adds 13e7865 Transforme la Date en Timestamp (etend date) pour eviter les erreur sql d'update liées aux dates désérialisées adds 309acb4 Corrige typo adds b20d87c Add entity enum + deal with blobs in import - export of trips (introduce a new api to be used soon also for bi-directionnal data synchro) adds 991b551 Improve actions layout adds a872102 Use a unique management trip service for export data and bi-synchro data adds b2ca067 Use a parameter to fix read lock timeout adds eb0ee6a Merge branch 'feature/deal_with_blobs' into develop adds 4ab6758 push back actions before export adds 6b1e172 Corrige la source utilisée pour la récupération des données à valider adds a7c7c6c Gere la désérialisation de proprieté d'objet de type AbstractReference (ex.: ValidateResultForDto) adds c6ae8f1 Corrige l'enregistrement de decorateur de type DataDto adds ddc292d Ajoute une définition et un convertisseur vers DataReference pour le type Tdr adds ba17982 Corrige les definitions enrichies pour basket et branchline en creant des dto specifiques adds bd0289e Corrige l'ajout d'une définition en vérifiant qu'il n'existe pas déjà une définition pour l'entité concernée adds 25b381c Refactorise les entités BasketWithSection et BranchlineWithBasket et corrige les erreurs de compilation adds 571d9c3 Corrige les tests suite à l'ajout des nouveaux bean BasketWithSectionDto et BranchlineWithBasketDto adds 56da77d Renomme également les dto (ex: BasketWithSectionDto -> BasketWithSectionIdDto) adds 9724b0d Corrige les libellés vide concernant les objets invalides dans le fichier de rapport généré adds b62f5c6 Merge branch 'feature/7493_corrige_action_validation_serveur_distant' into 'develop' new 76e8956 Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet new c27e30b Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto new e1c4880 Merge branch 'feature/7677_action_export_donnees_server_distant' into develop new 1c0387f Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur new cfdf353 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler new e218953 Ajoute des icones sur les boutons du BeanTreeHeader new eac031e Ajoute le BeanTreeHeader au panneau de sélection des données new 9a9340e Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' new 2050a74 merge i18n new 4f0fac5 Optimize css new be1d4f4 Be able to show or not actions (fold or select) of the tree header new 20fc7d9 Rename tree header id new 3ce195b Add tree header in other places in application This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ceac497) \ N -- N -- N refs/heads/feature/7553_ajoute_un_widget_pour_les_arbres (3ce195b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 13 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 3ce195b24f65ec9d7034dd2e7159ec3aff84d8ee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 23 13:11:51 2016 +0200 Add tree header in other places in application commit 20fc7d9da88d77bf7398a2e69fc68647ef2b13c5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 23 12:55:38 2016 +0200 Rename tree header id commit be1d4f47c56b746b9b557b8d1c27a761acded7b1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 23 12:45:40 2016 +0200 Be able to show or not actions (fold or select) of the tree header commit 4f0fac5c5c0687fe88361183c98128580e016fee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 23 12:32:24 2016 +0200 Optimize css commit 2050a74ab1139aa9270d64624fcff9b8c1b96ad5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 23 12:32:11 2016 +0200 merge i18n commit 9a9340e9613750a417d8586421bb7b073002b94d Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Tue Aug 23 10:14:52 2016 +0200 Configure le label du BeanTreeHeader avec un attibut de composant 'labelText' refs #7553 commit eac031eaaf0ec8fa278ddf5bff852c2c7ff2b21b Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Mon Aug 22 23:24:52 2016 +0200 Ajoute le BeanTreeHeader au panneau de sélection des données commit e2189537a1a40426a8b732cffa17e70af258ebe8 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Mon Aug 22 23:20:15 2016 +0200 Ajoute des icones sur les boutons du BeanTreeHeader refs #7553 commit cfdf35337bd1d87c21231952c7253303facac531 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Mon Aug 22 20:10:11 2016 +0200 Implementation du comportement des boutons de la toolbar du BeanTreeHeader dans le handler refs #7553 commit 1c0387f13fe16c7c6a2daa75c663a5e61623bb22 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Sun Aug 21 23:45:16 2016 +0200 Crée le composant BeanTreeHeader visant à offrir un group d'actions facilitant l'utilisation des composants arbre par l'utilisateur refs #7553 commit e1c48802c89dc6ff04108c4bbc120198f12a634c Merge: b62f5c6 c27e30b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 27 12:17:44 2016 +0200 Merge branch 'feature/7677_action_export_donnees_server_distant' into develop commit c27e30b73025f80ede2ed12e3f342c84a5f7a67e Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Tue Aug 23 23:16:15 2016 +0200 Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto refs #7677 commit 76e89566a1c2c95bd668fb14f70a2e79516ac919 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Tue Aug 23 18:21:24 2016 +0200 Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet refs #7677 Summary of changes: .../swing/decoration/DecoratorService.java | 20 +- .../src/main/filters/observe-ui.properties | 2 +- .../ObserveSwingApplicationConfig.java | 3 - .../fr/ird/observe/db/ObserveSwingDataSource.java | 12 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 88 ++++++++- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 12 +- .../ird/observe/ui/admin/export/ExportModel.java | 2 +- .../observe/ui/admin/export/ExportUIHandler.java | 124 +++++------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 11 ++ .../observe/ui/admin/save/SaveLocalUIHandler.java | 3 +- .../synchronize/data/DataSynchroUIHandler.java | 178 +++++++++++------- .../observe/ui/admin/validate/ValidateModel.java | 10 +- .../ui/admin/validate/ValidateUIHandler.java | 3 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../impl/longline/LonglinePositionHelper.java | 10 +- .../ird/observe/ui/storage/StorageUIHandler.java | 4 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 2 +- .../observe-application-swing_en_GB.properties | 10 + .../observe-application-swing_es_ES.properties | 10 + .../observe-application-swing_fr_FR.properties | 16 +- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 1 + .../v1/SqlScriptProducerServiceController.java | 3 +- .../export/ReplicateTripServiceController.java | 52 ------ .../data/DataSynchronizeServiceController.java | 32 ---- .../v1/trip/TripManagementServiceController.java | 61 ++++++ .../observe/ObserveTopiaConfigurationFactory.java | 4 +- .../observe/ObserveTopiaPersistenceContext.java | 3 +- .../observe/services/ObserveServicesProvider.java | 7 +- .../service/AddSqlScriptProducerResult.java | 27 +++ .../service/DeleteSqlScriptProducerRequest.java | 21 +-- .../services/service/ObserveBlobsContainer.java | 37 ++++ .../services/service/SqlScriptProducerService.java | 2 +- .../export/ReplicateTripsExportRequest.java | 99 ---------- .../actions/export/ReplicateTripsExportResult.java | 100 ---------- .../actions/export/ReplicateTripsImportResult.java | 90 --------- .../synchro/data/DataSynchronizeRequest.java | 103 ---------- .../synchro/data/DataSynchronizeService.java | 52 ------ .../synchro/data/task/DataSynchronizeCopyTask.java | 14 -- .../data/task/DataSynchronizeDeleteTask.java | 14 -- ...nidirectionalReferentialSynchronizeRequest.java | 35 +++- ...UnidirectionalReferentialSynchronizeResult.java | 3 +- .../DeleteTripRequest.java} | 14 +- .../services/service/trip/DeleteTripResult.java | 26 +++ .../ExportTripRequest.java} | 14 +- .../services/service/trip/ExportTripResult.java | 51 +++++ .../services/service/trip/ImportTripRequest.java | 42 +++++ .../services/service/trip/ImportTripResult.java | 51 +++++ .../TripManagementService.java} | 16 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 3 + .../dto/gson/ReferentialMultimapAdapter.java | 5 +- .../gson/reference/UnknownReferenceAdapter.java | 69 +++++++ ...{BasketDto.java => BasketWithSectionIdDto.java} | 4 +- ...lineDto.java => BranchlineWithBasketIdDto.java} | 4 +- .../dto/reference/DataReferenceSetDefinitions.java | 33 +++- .../dto/referential/ReferentialMultimap.java | 29 +++ .../services/binder/BinderEngineInitializer.java | 6 + .../services/binder/data/TargetLengthBinder.java | 12 +- .../observe/services/binder/data/TdrBinder.java | 13 +- .../binder/data/TransmittingBuoyBinder.java | 8 +- .../services/service/DataSourceServiceTopia.java | 18 +- .../service/SqlScriptProducerServiceTopia.java | 15 +- .../actions/export/ReplicateTripServiceTopia.java | 115 ------------ .../synchro/data/DataSynchronizeServiceTopia.java | 108 ----------- .../ReferentialSynchronizeDiffServiceTopia.java | 5 +- .../sql/UpdateSqlStatementGenerator.java | 2 +- .../service/trip/ImportTripScriptTopiaSqlWork.java | 68 +++++++ .../service/trip/TripManagementServiceTopia.java | 207 +++++++++++++++++++++ .../services/binder/BinderEngineMetadataTest.java | 2 +- .../AddSqlScriptProducerServiceTopiaTest.java | 2 +- .../services/service/MigrateTestsDatabases.java | 6 +- .../persistence/metadata/TopiaMetadataEntity.java | 16 ++ .../nuiton/topia/service/sql/batch/SqlResult.java | 23 +++ .../service/sql/batch/TopiaSqlBatchService.java | 6 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 75 ++++++-- .../sql/batch/actions/AbstractSqlAction.java | 52 ++++-- .../sql/batch/actions/AbstractTablesAction.java | 48 +---- .../service/sql/batch/actions/BlobsContainer.java | 80 ++++++++ .../sql/batch/actions/DeleteTablesAction.java | 13 +- .../sql/batch/actions/ReplicateTablesAction.java | 71 ++++++- .../service/sql/batch/tables/TopiaSqlTable.java | 36 +++- .../service/sql/batch/tables/TopiaSqlTables.java | 114 +++++++----- .../sql/batch/tables/TopiaSqlTablesFactory.java | 5 +- 85 files changed, 1571 insertions(+), 1210 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/ReplicateTripServiceController.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/data/DataSynchronizeServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeService.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeCopyTask.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeDeleteTask.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/synchro/data/task/DataSynchronizeTaskSupport.java => trip/DeleteTripRequest.java} (51%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/synchro/data/task/DataSynchronizeTaskSupport.java => trip/ExportTripRequest.java} (51%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/export/ReplicateTripService.java => trip/TripManagementService.java} (75%) create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java rename observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/{BasketDto.java => BasketWithSectionIdDto.java} (88%) rename observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/{BranchlineDto.java => BranchlineWithBasketIdDto.java} (87%) delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java create mode 100644 observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlResult.java create mode 100644 observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/BlobsContainer.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 12

01/13: Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet
by codelutin.com scm 27 Aug '16

27 Aug '16

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7553_ajoute_un_widget_pour_les_arbres in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 76e89566a1c2c95bd668fb14f70a2e79516ac919 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Tue Aug 23 18:21:24 2016 +0200 Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet refs #7677 --- .../web/ObserveWebApplicationListener.java | 2 + ...tionalReferntialSynchronizeRequestInjector.java | 75 ++++++++++++++++++++++ ...nidirectionalReferentialSynchronizeRequest.java | 32 ++++++--- .../dto/gson/ReferentialMultimapAdapter.java | 5 +- .../dto/referential/ReferentialMultimap.java | 29 +++++++++ .../ReferentialSynchronizeDiffServiceTopia.java | 5 +- 6 files changed, 134 insertions(+), 14 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java index f4bd444..b6b757c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -31,6 +31,7 @@ import fr.ird.observe.application.web.injector.ObserveDataSourceConfigurationInj import fr.ird.observe.application.web.injector.ObserveDtoInjector; import fr.ird.observe.application.web.injector.ObserveReferenceSetRequestInjector; import fr.ird.observe.application.web.injector.SqlScriptProducerRequestInjector; +import fr.ird.observe.application.web.injector.UnidirectionalReferntialSynchronizeRequestInjector; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.dto.ObserveDbUserDto; import org.apache.commons.logging.Log; @@ -71,6 +72,7 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { context.addInjector(new DateInjector(ObserveDataSourceConfigurationRestConstants.DATE_PATTERN)); context.addInjector(new SqlScriptProducerRequestInjector(gson)); context.addInjector(new ImmutableSetInjector()); + context.addInjector(new UnidirectionalReferntialSynchronizeRequestInjector(gson)); context.addConverter(new ObserveDtoConverter(gson), ObserveDbUserDto.class); context.getServletContext().setAttribute( diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java new file mode 100644 index 0000000..59f0ad6 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/injector/UnidirectionalReferntialSynchronizeRequestInjector.java @@ -0,0 +1,75 @@ +package fr.ird.observe.application.web.injector; + +/*- + * #%L + * ObServe :: Application Web + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Preconditions; +import com.google.gson.Gson; +import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.debux.webmotion.server.call.Call; +import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; +import org.debux.webmotion.server.mapping.Mapping; + +import java.lang.reflect.Type; + +/** + * @author Samuel Maisonneuve - maisonneuve(a)codelutin.com + */ +public class UnidirectionalReferntialSynchronizeRequestInjector implements ExecutorParametersInjectorHandler.Injector { + + /** Logger. */ + private static final Log log = LogFactory.getLog(UnidirectionalReferntialSynchronizeRequestInjector.class); + + protected final Gson gson; + + public UnidirectionalReferntialSynchronizeRequestInjector(Gson gson) { + this.gson = gson; + } + + @Override + public Object getValue(Mapping mapping, Call call, String name, Class<?> type, Type generic) { + + UnidirectionalReferentialSynchronizeRequest result = null; + + if (type.equals(UnidirectionalReferentialSynchronizeRequest.class)) { + + Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name); + + Preconditions.checkNotNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!"); + + String gsonContent = ((String[]) parameterTree.getValue())[0]; + + result = gson.fromJson(gsonContent, UnidirectionalReferentialSynchronizeRequest.class); + + if (log.isInfoEnabled()) { + log.info("Inject UnidirectionalReferntialSynchronizeRequestInjector: " + result); + } + + } + + return result; + + } + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java index fbab2e4..4ec070a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeRequest.java @@ -25,7 +25,9 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multiset; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialMultimap; import java.util.Objects; @@ -47,8 +49,8 @@ public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDt } private final Class<R> referentialName; - private final ImmutableSet<R> referentialToAdd; - private final ImmutableSet<R> referentialToUpdate; + private final ReferentialMultimap<R> referentialToAdd; + private final ReferentialMultimap<R> referentialToUpdate; private final ImmutableSet<String> referentialToRemove; private final ImmutableMap<String, String> referentialToReplace; @@ -57,11 +59,25 @@ public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDt } public ImmutableSet<R> getReferentialToAdd() { - return referentialToAdd; + ImmutableSet<R> result = new ImmutableSet.Builder().build(); + + Multiset<Class<R>> entries = referentialToAdd.keys(); + if (!entries.isEmpty()) { + result = referentialToAdd.get(entries.iterator().next()); + } + + return result; } public ImmutableSet<R> getReferentialToUpdate() { - return referentialToUpdate; + ImmutableSet<R> result = new ImmutableSet.Builder().build(); + + Multiset<Class<R>> entries = referentialToUpdate.keys(); + if (!entries.isEmpty()) { + result = referentialToUpdate.get(entries.iterator().next()); + } + + return result; } public ImmutableSet<String> getReferentialToRemove() { @@ -100,8 +116,8 @@ public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDt } private UnidirectionalReferentialSynchronizeRequest(Class<R> referentialName, - ImmutableSet<R> referentialToAdd, - ImmutableSet<R> referentialToUpdate, + ReferentialMultimap<R> referentialToAdd, + ReferentialMultimap<R> referentialToUpdate, ImmutableSet<String> referentialToRemove, ImmutableMap<String, String> toReplace) { this.referentialName = referentialName; @@ -114,8 +130,8 @@ public class UnidirectionalReferentialSynchronizeRequest<R extends ReferentialDt public static class Builder<R extends ReferentialDto> { private final Class<R> referentialName; - private final ImmutableSet.Builder<R> toAddBuilder = ImmutableSet.builder(); - private final ImmutableSet.Builder<R> toUpdateBuilder = ImmutableSet.builder(); + private final ReferentialMultimap.Builder<R> toAddBuilder = ReferentialMultimap.builder(); + private final ReferentialMultimap.Builder<R> toUpdateBuilder = ReferentialMultimap.builder(); private final ImmutableSet.Builder<String> toRemoveBuilder = ImmutableSet.builder(); private final ImmutableMap.Builder<String, String> toReplaceBuilder = ImmutableMap.builder(); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java index 516a255..bd1b59d 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.dto.gson; * #L% */ -import com.google.common.collect.ImmutableSetMultimap; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import com.google.gson.JsonDeserializationContext; @@ -53,7 +52,7 @@ public class ReferentialMultimapAdapter implements JsonSerializer<ReferentialMul @Override public ReferentialMultimap deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException { - ImmutableSetMultimap.Builder builder = ImmutableSetMultimap.builder(); + ReferentialMultimap.Builder builder = ReferentialMultimap.builder(); Set<Map.Entry<String, JsonElement>> entries = json.getAsJsonObject().entrySet(); for (Map.Entry<String, JsonElement> entry : entries) { @@ -72,7 +71,7 @@ public class ReferentialMultimapAdapter implements JsonSerializer<ReferentialMul builder.putAll(key, values); } - return ReferentialMultimap.copyOf(builder.build()); + return builder.build(); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java index 1d1fb78..451b27f 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialMultimap.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto.referential; * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; @@ -52,6 +53,34 @@ public class ReferentialMultimap<K extends ReferentialDto> implements SetMultima return new ReferentialMultimap(multimap); } + public static <K extends ReferentialDto> Builder<K> builder() { + return new Builder<>(); + } + + public static class Builder<K extends ReferentialDto> { + private final ImmutableSetMultimap.Builder builder = ImmutableSetMultimap.builder(); + + public <K extends ReferentialDto> Builder add(K referentialDto) { + Preconditions.checkNotNull(referentialDto, "Can't add a null object in ReferentialMultimap"); + builder.put(referentialDto.getClass(), referentialDto); + return this; + } + + public <K extends ReferentialDto> Builder put(Class<K> dtoType, K referentialDto) { + builder.putAll(dtoType, referentialDto); + return this; + } + + public <K extends ReferentialDto> Builder putAll(Class<K> dtoType, Collection<K> values) { + builder.putAll(dtoType, values); + return this; + } + + public ReferentialMultimap<K> build() { + return copyOf(builder.build()); + } + } + private ReferentialMultimap() { immutableSetMultimap = ImmutableSetMultimap.<Class<K>, K>builder().build(); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java index b4f701a..e83e77e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.service.actions.synchro.referential.diff; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSetMultimap; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.Entities; @@ -65,7 +64,7 @@ public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia } private <E extends ObserveReferentialEntity, R extends ReferentialDto> ReferentialMultimap<R> getReferentials0(Class<R> dtoType, Class<E> entityType, ImmutableSet<String> ids) { - ImmutableSetMultimap.Builder<Class<R>, R> result = ImmutableSetMultimap.builder(); + ReferentialMultimap.Builder<R> result = ReferentialMultimap.builder(); ReferentialLocale referentialLocale = getReferentialLocale(); List<E> entities = loadEntities(entityType, ids); for (E entity : entities) { @@ -73,7 +72,7 @@ public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia result.put(dtoType, binder.toDto(referentialLocale, entity)); } - return ReferentialMultimap.copyOf(result.build()); + return result.build(); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7677_action_export_donnees_server_distant deleted (was 4be2b8a)
by codelutin.com scm 27 Aug '16

27 Aug '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7677_action_export_donnees_server_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git was 4be2b8a Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7677_action_export_donnees_server_distant updated (147815f -> 4be2b8a)
by codelutin.com scm 27 Aug '16

27 Aug '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7677_action_export_donnees_server_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git omits 147815f Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto omits eab2d46 Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet adds 7507619 changement des loggeurs adds f2ef0f2 Ajouter l'heure dans les informations technique d'un référentiel adds 799b1c4 Ajout d'un FIXME qu'il faudrait mieux gérer adds e3e0875 Amélioration de gestion des associations dans les sql batch tables adds 573de56 Correction de la suppression des données adds eece9f6 Can use remote data source in simple referential synchro adds 9993341 Champs non binde :( adds a626ca7 Renommage méthode adds 32aa66b Utilisation d'un meilleur nom de rapport de validation adds 7df5e6a En fait pas besoin des droits en écriture pour l'action de validation adds 13e7865 Transforme la Date en Timestamp (etend date) pour eviter les erreur sql d'update liées aux dates désérialisées adds 309acb4 Corrige typo adds b20d87c Add entity enum + deal with blobs in import - export of trips (introduce a new api to be used soon also for bi-directionnal data synchro) adds 991b551 Improve actions layout adds a872102 Use a unique management trip service for export data and bi-synchro data adds b2ca067 Use a parameter to fix read lock timeout adds eb0ee6a Merge branch 'feature/deal_with_blobs' into develop adds 4ab6758 push back actions before export new 71ea0ff Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet new 4be2b8a Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (147815f) \ N -- N -- N refs/heads/feature/7677_action_export_donnees_server_distant (4be2b8a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 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 4be2b8a5db63774e26c535ef9954bad45c2ed032 Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Tue Aug 23 23:16:15 2016 +0200 Corrige les erreurs d'injection des objets de type Request/Result en implémentant le contrat ObserveDto refs #7677 commit 71ea0fff798c121be7c81c1f80fe731bcabf398d Author: Samuel Maisonneuve <maisonneuve(a)codelutin.com> Date: Tue Aug 23 18:21:24 2016 +0200 Remplace ImmutableSet<ReferentilDto> par des ReferntialMultimap dans UnidirectionalReferentialSynchronizeRequest afin de permettre la deserialisation de cet objet refs #7677 Summary of changes: .../src/main/filters/observe-ui.properties | 2 +- .../ObserveSwingApplicationConfig.java | 3 - .../fr/ird/observe/db/ObserveSwingDataSource.java | 12 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 3 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 88 ++++++++- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 12 +- .../ird/observe/ui/admin/export/ExportModel.java | 2 +- .../observe/ui/admin/export/ExportUIHandler.java | 124 +++++------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 11 ++ .../observe/ui/admin/save/SaveLocalUIHandler.java | 3 +- .../synchronize/data/DataSynchroUIHandler.java | 178 +++++++++++------- .../observe/ui/admin/validate/ValidateModel.java | 10 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ird/observe/ui/storage/StorageUIHandler.java | 4 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 2 +- .../observe-application-swing_en_GB.properties | 10 + .../observe-application-swing_es_ES.properties | 10 + .../observe-application-swing_fr_FR.properties | 16 +- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/observe-log4j.properties | 1 + .../v1/SqlScriptProducerServiceController.java | 3 +- .../export/ReplicateTripServiceController.java | 52 ------ .../data/DataSynchronizeServiceController.java | 32 ---- .../v1/trip/TripManagementServiceController.java | 61 ++++++ .../observe/ObserveTopiaConfigurationFactory.java | 4 +- .../observe/ObserveTopiaPersistenceContext.java | 3 +- .../observe/services/ObserveServicesProvider.java | 7 +- .../service/AddSqlScriptProducerResult.java | 27 +++ .../service/DeleteSqlScriptProducerRequest.java | 21 +-- .../services/service/ObserveBlobsContainer.java | 37 ++++ .../services/service/SqlScriptProducerService.java | 2 +- .../export/ReplicateTripsExportRequest.java | 100 ---------- .../actions/export/ReplicateTripsExportResult.java | 101 ---------- .../actions/export/ReplicateTripsImportResult.java | 91 --------- .../synchro/data/DataSynchronizeRequest.java | 104 ----------- .../synchro/data/DataSynchronizeService.java | 52 ------ .../synchro/data/task/DataSynchronizeCopyTask.java | 14 -- .../data/task/DataSynchronizeDeleteTask.java | 14 -- .../DeleteTripRequest.java} | 14 +- .../services/service/trip/DeleteTripResult.java | 26 +++ .../ExportTripRequest.java} | 14 +- .../services/service/trip/ExportTripResult.java | 51 +++++ .../services/service/trip/ImportTripRequest.java | 42 +++++ .../services/service/trip/ImportTripResult.java | 51 +++++ .../TripManagementService.java} | 16 +- .../services/binder/data/TargetLengthBinder.java | 12 +- .../services/service/DataSourceServiceTopia.java | 18 +- .../service/SqlScriptProducerServiceTopia.java | 15 +- .../actions/export/ReplicateTripServiceTopia.java | 115 ------------ .../synchro/data/DataSynchronizeServiceTopia.java | 108 ----------- .../sql/UpdateSqlStatementGenerator.java | 2 +- .../service/trip/ImportTripScriptTopiaSqlWork.java | 68 +++++++ .../service/trip/TripManagementServiceTopia.java | 207 +++++++++++++++++++++ .../AddSqlScriptProducerServiceTopiaTest.java | 2 +- .../services/service/MigrateTestsDatabases.java | 6 +- .../persistence/metadata/TopiaMetadataEntity.java | 16 ++ .../nuiton/topia/service/sql/batch/SqlResult.java | 23 +++ .../service/sql/batch/TopiaSqlBatchService.java | 6 +- .../sql/batch/TopiaSqlBatchServiceImpl.java | 75 ++++++-- .../sql/batch/actions/AbstractSqlAction.java | 52 ++++-- .../sql/batch/actions/AbstractTablesAction.java | 48 +---- .../service/sql/batch/actions/BlobsContainer.java | 80 ++++++++ .../sql/batch/actions/DeleteTablesAction.java | 13 +- .../sql/batch/actions/ReplicateTablesAction.java | 71 ++++++- .../service/sql/batch/tables/TopiaSqlTable.java | 36 +++- .../service/sql/batch/tables/TopiaSqlTables.java | 114 +++++++----- .../sql/batch/tables/TopiaSqlTablesFactory.java | 5 +- 68 files changed, 1362 insertions(+), 1171 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/ReplicateTripServiceController.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/data/DataSynchronizeServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/AddSqlScriptProducerResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/ObserveBlobsContainer.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeService.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeCopyTask.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/data/task/DataSynchronizeDeleteTask.java copy observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/synchro/data/task/DataSynchronizeTaskSupport.java => trip/DeleteTripRequest.java} (51%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/DeleteTripResult.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/synchro/data/task/DataSynchronizeTaskSupport.java => trip/ExportTripRequest.java} (51%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripResult.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/{actions/export/ReplicateTripService.java => trip/TripManagementService.java} (75%) delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripScriptTopiaSqlWork.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java create mode 100644 observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/SqlResult.java create mode 100644 observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/BlobsContainer.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2