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 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 new eb0ee6a Merge branch 'feature/deal_with_blobs' into develop new 4ab6758 push back actions before export 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 4ab67589264eb708e85d9e3b309af3afc427ab82 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 12:13:13 2016 +0200 push back actions before export commit eb0ee6a4f627034b679cb304948af535d2d73d64 Merge: 309acb4 b2ca067 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 12:11:00 2016 +0200 Merge branch 'feature/deal_with_blobs' into develop Summary of changes: .../src/main/filters/observe-ui.properties | 2 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 12 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 88 ++++++++- .../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 +++++++++++------- .../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 | 12 +- .../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 -- .../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/service/DataSourceServiceTopia.java | 12 +- .../service/SqlScriptProducerServiceTopia.java | 15 +- .../actions/export/ReplicateTripServiceTopia.java | 115 ------------ .../synchro/data/DataSynchronizeServiceTopia.java | 108 ----------- .../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/ReplicateTablesAction.java | 71 ++++++- .../service/sql/batch/tables/TopiaSqlTable.java | 19 +- .../service/sql/batch/tables/TopiaSqlTables.java | 53 +++--- .../sql/batch/tables/TopiaSqlTablesFactory.java | 5 +- 57 files changed, 1262 insertions(+), 1115 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>.