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@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@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@codelutin.com>.