This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from ce6f852 Add translation new 3a36842 Create mooring import service new 59af2e0 Introduce entityId in importLog (not working in UI) 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 59af2e00db8da4026e70caee758118dac54e39cd Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Jun 21 16:23:06 2016 +0200 Introduce entityId in importLog (not working in UI) commit 3a36842921147bdd918f043fbf4a6fa8e1308310 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Fri Jun 17 16:33:48 2016 +0200 Create mooring import service Summary of changes: .../Ports.java => DataAccousticProvider.java} | 28 +++--- .../fr/ifremer/echobase/entities/ImportLogs.java | 4 +- .../fr/ifremer/echobase/entities/ImportType.java | 20 +++- ...WorkingDbMigrationCallBackForVersion3_906.java} | 16 +-- .../i18n/echobase-domain_en_GB.properties | 2 + .../i18n/echobase-domain_fr_FR.properties | 2 + .../h2/3.906-0-update-importLog-entityId.sql | 1 + .../pg/3.906-0-update-importLog-entityId.sql | 1 + echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 98231 -> 98213 bytes .../echobase/services/csv/EchoBaseCsvUtil.java | 10 ++ .../services/service/UserDbPersistenceService.java | 14 ++- ...eption.java => DuplicatedMooringException.java} | 8 +- .../service/importdata/ImportDataService.java | 15 ++- .../actions/ImportDataActionSupport.java | 3 + ... => MooringCommonsImportDataActionSupport.java} | 11 ++- .../actions/MooringCommonsMooringImportAction.java | 109 +++++++++++++++++++++ .../actions/VoyageCommonsVoyageImportAction.java | 2 +- .../MooringAcousticsImportConfiguration.java | 14 +-- ...java => MooringCommonsImportConfiguration.java} | 31 +++--- ... => MooringImportDataConfigurationSupport.java} | 20 ++-- .../contexts/ImportDataContextSupport.java | 10 ++ .../MooringAcousticsImportDataContext.java | 2 +- ...t.java => MooringCommonsImportDataContext.java} | 13 ++- ...t.java => MooringImportDataContextSupport.java} | 24 +++-- .../contexts/VoyageImportDataContextSupport.java | 2 +- .../MooringCommonsMooringImportExportModel.java | 93 ++++++++++++++++++ .../strategy/AbstractImportDbStrategy.java | 37 +++---- .../importdb/strategy/FreeImportDbStrategy.java | 22 ++++- .../strategy/ReferentialImportDbStrategy.java | 3 +- .../service/removedata/RemoveDataService.java | 42 ++++---- .../strategy/AbstractRemoveDataStrategy.java | 20 ++-- .../strategy/AcousticRemoveDataStrategy.java | 13 ++- .../strategy/CatchesRemoveDataStrategy.java | 7 +- .../strategy/CommonAllRemoveDataStrategy.java | 10 +- .../strategy/CommonTransectRemoveDataStrategy.java | 13 ++- .../strategy/CommonTransitRemoveDataStrategy.java | 14 ++- .../strategy/CommonVoyageRemoveDataStrategy.java | 11 ++- .../strategy/LegacyVoyageRemoveDataStrategy.java | 10 +- .../strategy/OperationRemoveDataStrategy.java | 7 +- .../strategy/ResultEsduRemoveDataStrategy.java | 7 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 8 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 8 +- .../strategy/ResultRegionRemoveDataStrategy.java | 8 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 13 ++- .../i18n/echobase-services_en_GB.properties | 2 + .../i18n/echobase-services_fr_FR.properties | 2 + .../removedata/AbstractRemoveDataServiceTest.java | 2 +- ...sticImport.java => ConfigureMooringImport.java} | 39 +++++--- .../ui/actions/importData/ImportMooringMode.java | 5 +- .../ui/actions/importData/SelectImportType.java | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + ...atchesImport.jsp => configureMooringImport.jsp} | 32 ++---- 54 files changed, 558 insertions(+), 238 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Ports.java => DataAccousticProvider.java} (70%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_905.java => WorkingDbMigrationCallBackForVersion3_906.java} (62%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.906-0-update-importLog-entityId.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.906-0-update-importLog-entityId.sql copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedVoyageException.java => DuplicatedMooringException.java} (77%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{MooringAcousticsImportDataActionSupport.java => MooringCommonsImportDataActionSupport.java} (73%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsMooringImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringCommonsImportConfiguration.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringImportDataConfigurationSupport.java} (67%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageCommonsImportDataContext.java => MooringCommonsImportDataContext.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringAcousticsImportDataContext.java => MooringImportDataContextSupport.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsMooringImportExportModel.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchMooringAcousticImport.java => ConfigureMooringImport.java} (52%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureCatchesImport.jsp => configureMooringImport.jsp} (65%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.