This is an automated email from the git hooks/post-receive script. New change to branch feature/deal_with_blobs in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 1e3d400 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) new 8f30f6a Improve actions layout new 09863e6 Use a unique management trip service for export data and bi-synchro data new 7540dc0 Use a parameter to fix read lock timeout The 3 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 7540dc0437b98d269cbb024e4a1f358fc14dac3b Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 12:06:40 2016 +0200 Use a parameter to fix read lock timeout commit 09863e615b56e98bed16b9b818e577ccf1f8c4ae Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 12:06:08 2016 +0200 Use a unique management trip service for export data and bi-synchro data commit 8f30f6a46b2164d66a1bdc1a75db1d8e710fb2b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 27 09:08:43 2016 +0200 Improve actions layout Summary of changes: .../src/main/filters/observe-ui.properties | 2 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 18 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 5 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 86 ++++++++- .../observe/ui/admin/export/ExportUIHandler.java | 112 ++++------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 7 + .../synchronize/data/DataSynchroUIHandler.java | 178 +++++++++++------- .../observe-application-swing_en_GB.properties | 9 + .../observe-application-swing_es_ES.properties | 9 + .../observe-application-swing_fr_FR.properties | 9 + .../data/DataSynchronizeServiceController.java | 32 ---- .../v1/trip/ExportTripServiceController.java | 47 ----- .../v1/trip/ImportTripServiceController.java | 47 ----- .../v1/trip/TripManagementServiceController.java | 61 ++++++ .../observe/ObserveTopiaConfigurationFactory.java | 4 +- .../observe/services/ObserveServicesProvider.java | 10 +- .../service/DeleteSqlScriptProducerRequest.java | 21 +-- .../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/ExportTripsRequest.java | 98 ---------- .../services/service/trip/ExportTripsResult.java | 121 ------------ .../services/service/trip/ImportTripRequest.java | 42 +++++ .../services/service/trip/ImportTripResult.java | 51 +++++ .../services/service/trip/ImportTripService.java | 43 ----- .../services/service/trip/ImportTripsRequest.java | 105 ----------- .../services/service/trip/ImportTripsResult.java | 93 --------- ...TripService.java => TripManagementService.java} | 16 +- .../synchro/data/DataSynchronizeServiceTopia.java | 108 ----------- .../service/trip/ExportTripServiceTopia.java | 77 -------- .../service/trip/ImportTripServiceTopia.java | 121 ------------ .../service/trip/TripManagementServiceTopia.java | 207 +++++++++++++++++++++ 37 files changed, 745 insertions(+), 1282 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/data/DataSynchronizeServiceController.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/ExportTripServiceController.java delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/ImportTripServiceController.java create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/trip/TripManagementServiceController.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 delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripsRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ExportTripsResult.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 delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripService.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripsRequest.java delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/trip/ImportTripsResult.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/trip/{ExportTripService.java => TripManagementService.java} (72%) delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/data/DataSynchronizeServiceTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/ExportTripServiceTopia.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/ImportTripServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/trip/TripManagementServiceTopia.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.