[Echobase-commits] branch feature/8180 updated (33247f7 -> 4b96b1f)

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 33247f7 Add DataAcousticProvider in the model to avoid cast new 4b96b1f Create basic import AncillaryInstrumentation for Mooring The 1 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 4b96b1f11ca71f2727bde6e93619542fc85d2f62 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Jun 29 15:32:43 2016 +0200 Create basic import AncillaryInstrumentation for Mooring Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 9 -- .../fr/ifremer/echobase/entities/ImportType.java | 14 +++ .../entities/data/DataAcousticProvider.java | 18 ++-- .../{references/Ports.java => data/Moorings.java} | 12 +-- .../ifremer/echobase/entities/data/VoyageImpl.java | 11 ++ .../{Ports.java => AncillaryInstrumentations.java} | 12 +-- .../i18n/echobase-domain_en_GB.properties | 4 + .../i18n/echobase-domain_fr_FR.properties | 4 + .../echobase/services/csv/EchoBaseCsvUtil.java | 22 ++++ .../services/service/UserDbPersistenceService.java | 9 ++ ...illaryInstrumentationAssociationException.java} | 10 +- .../service/importdata/ImportDataService.java | 38 +++++-- ...mportAncillaryInstrumentationActionSupport.java | 113 +++++++++++++++++++++ .../actions/ImportDataActionSupport.java | 6 -- ...ommonsAncillaryInstrumentationImportAction.java | 66 ++++++++++++ .../MooringCommonsImportDataActionSupport.java | 8 +- .../actions/MooringCommonsMooringImportAction.java | 18 ++-- ...VoyageResultsRegionAssociationImportAction.java | 4 - ...cillaryInstrumentationImportConfiguration.java} | 18 ++-- ... MooringCommonsMooringImportConfiguration.java} | 6 +- .../MooringImportDataConfigurationSupport.java | 2 +- .../VoyageCommonsImportConfiguration.java | 9 +- .../contexts/ImportDataContextSupport.java | 11 ++ ...AncillaryInstrumentationImportDataContext.java} | 19 +++- ...=> MooringCommonsMooringImportDataContext.java} | 8 +- .../contexts/VoyageImportDataContextSupport.java | 4 - .../importdata/csv/AcousticImportExportModel.java | 2 +- .../csv/AncillaryInstrumentationImportRow.java | 57 +++++++++++ ...sAncillaryInstrumentationImportExportModel.java | 60 +++++++++++ ...ngCommonsAncillaryInstrumentationImportRow.java | 69 +++++++++++++ ...=> MooringCommonsMooringImportExportModel.java} | 14 +-- ...sAncillaryInstrumentationImportExportModel.java | 60 +++++++++++ ...eCommonsAncillaryInstrumentationImportRow.java} | 23 ++--- .../service/removedata/RemoveDataService.java | 8 +- ...aStrategy.java => DummyRemoveDataStrategy.java} | 9 +- .../i18n/echobase-services_en_GB.properties | 2 + .../i18n/echobase-services_fr_FR.properties | 2 + .../echobase/services/EchoBaseServiceFixtures.java | 8 ++ .../echobase/services/ImportDataFixtures.java | 2 + ...nsAncillaryInstrumentationImportServiceIT.java} | 28 ++--- ...a => MooringCommonsMooringImportServiceIT.java} | 16 +-- .../removedata/AbstractRemoveDataServiceTest.java | 5 +- .../import-data/echobase-mooring.h2.db.gz | Bin 936865 -> 938590 bytes .../mooring/ancillaryInstrumentation.csv.gz | Bin 0 -> 96 bytes .../importData/ConfigureMooringCommonsImport.java | 10 +- .../importData/LaunchMooringCommonsImport.java | 10 +- 46 files changed, 684 insertions(+), 156 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Ports.java => data/Moorings.java} (79%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Ports.java => AncillaryInstrumentations.java} (75%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedEchotypeAssociationException.java => DuplicatedAncillaryInstrumentationAssociationException.java} (71%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsAncillaryInstrumentationImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{MooringCommonsImportConfiguration.java => MooringCommonsAncillaryInstrumentationImportConfiguration.java} (66%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{MooringCommonsImportConfiguration.java => MooringCommonsMooringImportConfiguration.java} (89%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringAcousticsImportDataContext.java => MooringCommonsAncillaryInstrumentationImportDataContext.java} (63%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{MooringCommonsImportDataContext.java => MooringCommonsMooringImportDataContext.java} (75%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AncillaryInstrumentationImportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsAncillaryInstrumentationImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsAncillaryInstrumentationImportRow.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MooringCommonsImportExportModel.java => MooringCommonsMooringImportExportModel.java} (85%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsAncillaryInstrumentationImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportRow.java => VoyageCommonsAncillaryInstrumentationImportRow.java} (67%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{DummyMooringRemoveDataStrategy.java => DummyRemoveDataStrategy.java} (77%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{MooringCommonsImportServiceIT.java => MooringCommonsAncillaryInstrumentationImportServiceIT.java} (53%) rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{MooringCommonsImportServiceIT.java => MooringCommonsMooringImportServiceIT.java} (74%) create mode 100644 echobase-services/src/test/resources/import-data/mooring/ancillaryInstrumentation.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.