This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 311cdf9 [jgitflow-maven-plugin]merging 'release/4.0-alpha-6' into 'master' adds 4f6c5de [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds db707d7 [jgitflow-maven-plugin]merging 'master' into 'develop' adds acde695 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 06a112d Add new import mode for mooring adds fcb76c3 Change style adds 2e685cb Plug action but they are not implemented adds cf4e900 Plug action but they are not implemented adds c45b350 Add form to import accoustics data for mooring adds 99e85b4 Force input action for the validation adds 05a6223 Implements accoustic data import for mooring adds 7d474b1 Add translation adds 05c4c41 Create mooring import service adds 240051e Add remove strategies for mooring (not tested) adds 26bbe2e Fix UI after modification on remove strategies for mooring adds bfe6e95 Create IT for mooring importation adds 1b4499d Finish mooring import forms adds c47f954 Fix description in modification logs adds e6c7d05 Begin create table in dashboard for mooring adds 2071c67 Fix error on Elementary cell when position is set at end adds 6f27c0e Fix tooltip, delete quote in string adds 8a4f1cc Add support to display a mooring adds 3f49ca8 Add support to display a mooring adds d33669f Toggle visibility between voyages and morings adds a7c6529 Toggle visibility between voyages and morings adds 4c7ad65 Add translate adds a1cb8d2 Add moring support in remove import adds be9b0fc Add test on remove mooring import adds ac4d5cc Add test on remove mooring acoustic import adds d1c2fe1 Force migration adds cad618b Force migration adds b6c4248 Add test on remove mooring acoustic import adds 0bc16f1 Add migration for database for the mooring adds 5ae4575 Fix test due to mooring acoustic import test adds 7f5fdb4 Fix test due to mooring acoustic import test adds 2459a0e Improve the perfomance on search duplicate cell (ref #8165) adds de9a623 Move migration to 3.907 version adds 1ab5806 Move migration to 3.907 version adds 54ce56d Update documentation for the mooring import adds 60bca11 Refactoring avoid copy/paste on acoustic import for voyage and mooring adds f255142 Fix delete import for mooring adds 249211a Fix delete import for mooring adds 6761c1d Refactoring on result import to make place for mooring adds 27d7303 Refactoring on echotype import to make place for mooring adds d25c1eb Add DataAcousticProvider in the model to avoid cast adds d0a307c Create basic import AncillaryInstrumentation for Mooring adds c5a4572 Add forgotten columns (refs #8370) adds e8830cb Handle duplication on elementary cell (refs #2246) adds b6ba2a9 Handle duplication on elementary cell (refs #2246) adds 6ec47de Handle duplication on elementary cell (refs #2246) adds 224bd1b Create ancillary intrumentation import for the voyage adds 9c65eef Handle remove ancillary instrumentation import adds a475079 Migrate database and add ancillary instrumentation adds 2061223 Complete documentation on Ancillary instrumentation import adds 871f148 Add echotype on mooring adds 90397fc Add echotype on mooring adds 251f4f7 Create service for echotype import for mooring adds 791d802 Create service for esdu results import for mooring adds 8d19a2d Create remove strategy for esdu results import for mooring adds 9edc202 Migrate database to introduce echotype for the mooring adds 38ee8f6 Complete documentation on mooring import adds 3c8ff7a Clear hibernate trasaction to increase performance during flush (refs #8165) adds 9425305 Add ancillary intrumentation in UI adds 98ec303 Add results import for mooring in UI adds 78ee58f Modify esdu cell name adds a574030 Use too elementary cell adds 00cbfce Add new import mode for mooring adds 5d437a7 Change style adds ff095a2 Plug action but they are not implemented adds 6627c4c Plug action but they are not implemented adds 173d055 Add form to import accoustics data for mooring adds 8bf46a6 Force input action for the validation adds 68d33c9 Implements accoustic data import for mooring adds ce6f852 Add translation adds 3a36842 Create mooring import service adds 59af2e0 Introduce entityId in importLog (not working in UI) adds f754e8b Add remove strategies for mooring (not tested) adds bb9d454 Fix UI after modification on remove strategies for mooring adds b1e59f8 Create IT for mooring importation adds c6e295c Finish mooring import forms adds c81b19a Fix description in modification logs adds a209554 Begin create table in dashboard for mooring adds 4cc1ac4 Fix error on Elementary cell when position is set at end adds e70d317 Fix tooltip, delete quote in string adds aec1002 Add support to display a mooring adds e18c828 Add support to display a mooring adds 9df8d02 Toggle visibility between voyages and morings adds 6c3b2f1 Toggle visibility between voyages and morings adds 359a065 Add translate adds 7912ed8 Add moring support in remove import adds 172b9b8 Add test on remove mooring import adds 386ecfb Add test on remove mooring acoustic import adds e1a4cb3 Force migration adds bacb8bb Force migration adds d9e0c99 Add test on remove mooring acoustic import adds 90f4702 Add migration for database for the mooring adds 782f88d Fix test due to mooring acoustic import test adds 1399fe4 Fix test due to mooring acoustic import test adds c576083 Improve the perfomance on search duplicate cell (ref #8165) adds 85d1ca3 Improve the perfomance on search duplicate cell (ref #8165) adds 76dd036 Improve the perfomance on search duplicate cell (ref #8165) adds 5056a51 Move migration to 3.907 version adds 316dc33 Move migration to 3.907 version adds c679de2 Update documentation for the mooring import adds d9be6f1 Refactoring avoid copy/paste on acoustic import for voyage and mooring adds 150c7e6 Fix delete import for mooring adds d3f6fb9 Fix delete import for mooring adds cd4c7ee Refactoring on result import to make place for mooring adds 612b6a3 Refactoring on echotype import to make place for mooring adds 33247f7 Add DataAcousticProvider in the model to avoid cast adds 4b96b1f Create basic import AncillaryInstrumentation for Mooring adds b47af30 Add forgotten columns (refs #8370) adds f334d59 Handle duplication on elementary cell (refs #2246) adds 99c6aaf Handle duplication on elementary cell (refs #2246) adds 0b01f5f Handle duplication on elementary cell (refs #2246) adds 9f0f94f Create ancillary intrumentation import for the voyage adds 4dc5610 Handle remove ancillary instrumentation import adds 499517a Migrate database and add ancillary instrumentation adds edc70c3 Complete documentation on Ancillary instrumentation import adds 0285289 Add echotype on mooring adds b4c446f Add echotype on mooring adds bcee297 Create service for echotype import for mooring adds 2b736c0 Create service for esdu results import for mooring adds e81e229 Create remove strategy for esdu results import for mooring adds cd9fa27 Migrate database to introduce echotype for the mooring adds ca641fb Complete documentation on mooring import adds 15ec21f Clear hibernate trasaction to increase performance during flush (refs #8165) adds efcdae6 Add ancillary intrumentation in UI adds f472fe9 Add results import for mooring in UI adds f641359 Modify esdu cell name adds 943c4a4 Use too elementary cell adds c88cba4 Merge branch 'feature/8180' of gitlab.nuiton.org:codelutin/echobase into feature/8180 adds f103039 Merge branch 'feature/8180' into develop adds ae0e78d Remove log adds 8073919 [jgitflow-maven-plugin]updating poms for 4.0-alpha-7 branch with snapshot versions adds 4f2e5cb Fix release on i18n keys and license header adds 51b9cbe [jgitflow-maven-plugin]updating poms for branch'release/4.0-alpha-7' with non-snapshot versions adds 6f26a64 [jgitflow-maven-plugin]merging 'release/4.0-alpha-7' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../echobase/entities/ImportFileIdTopiaDao.java | 9 - .../fr/ifremer/echobase/entities/ImportLogs.java | 4 +- .../fr/ifremer/echobase/entities/ImportType.java | 164 +++- .../echobase/entities/data/CellTopiaDao.java | 61 +- .../entities/data/DataAcousticProvider.java | 58 ++ ...GearMetadataValueImpl.java => MooringImpl.java} | 32 +- .../{references/Ports.java => data/Moorings.java} | 12 +- .../data/TransectImpl.java} | 43 +- .../ifremer/echobase/entities/data/VoyageImpl.java | 31 + .../{Ports.java => AncillaryInstrumentations.java} | 12 +- ...WorkingDbMigrationCallBackForVersion3_907.java} | 6 +- ...WorkingDbMigrationCallBackForVersion3_908.java} | 6 +- ...WorkingDbMigrationCallBackForVersion3_909.java} | 6 +- .../i18n/echobase-domain_en_GB.properties | 10 + .../i18n/echobase-domain_fr_FR.properties | 10 + ...906-0-add-indexes.sql => 3.906-add-indexes.sql} | 0 ...-0-add-indexes.sql => 3.908-0-drop-indexes.sql} | 2 +- ...tLog-table.sql => 3.909-0-mooring-echotype.sql} | 4 +- .../workingDb/h2/3.905-0-update-model.sql | 4 + .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 4 + .../3.907-0-update-importLog-entityId.sql} | 2 +- .../workingDb/pg/3.905-0-update-model.sql | 4 + .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 4 + .../3.907-0-update-importLog-entityId.sql} | 3 +- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 98231 -> 99798 bytes echobase-services/pom.xml | 2 +- .../fr/ifremer/echobase/services/csv/CellAble.java | 9 +- .../echobase/services/csv/CellValueParser.java | 49 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 32 + .../csv/{CellAble.java => ProviderAble.java} | 18 +- .../services/service/UserDbPersistenceService.java | 161 +++- ...illaryInstrumentationAssociationException.java} | 10 +- .../DuplicatedElementaryCellException.java | 5 +- .../importdata/DuplicatedEsduCellException.java | 5 +- ...eption.java => DuplicatedMooringException.java} | 8 +- .../importdata/EsduCellNotFoundException.java | 7 +- .../service/importdata/ImportDataFileResult.java | 10 +- .../service/importdata/ImportDataService.java | 178 ++++- ...ception.java => MismatchProviderException.java} | 6 +- ....java => MooringCodeAlreadyExistException.java} | 8 +- .../{MissionService.java => MooringService.java} | 18 +- ...ava => ResultsImportAlreadyExistException.java} | 6 +- ...tion.java => ImportAcousticsActionSupport.java} | 173 ++--- ...mportAncillaryInstrumentationActionSupport.java | 129 ++++ .../actions/ImportDataActionSupport.java | 36 +- ...ava => ImportResultsCellDataActionSupport.java} | 43 +- ...rt.java => ImportResultsDataActionSupport.java} | 20 +- ...ava => ImportResultsEchotypeActionSupport.java} | 72 +- .../actions/MooringAcousticsImportAction.java | 61 ++ ...ommonsAncillaryInstrumentationImportAction.java | 77 ++ ... => MooringCommonsImportDataActionSupport.java} | 10 +- .../actions/MooringCommonsMooringImportAction.java | 106 +++ .../MooringResultsCellImportDataActionSupport.java | 51 ++ .../MooringResultsEchotypeImportAction.java | 67 ++ ...chotypeAndSpeciesCategoryCellImportAction.java} | 32 +- ...ringResultsEsduByEchotypeCellImportAction.java} | 32 +- .../actions/VoyageAcousticsImportAction.java | 857 +-------------------- ...ommonsAncillaryInstrumentationImportAction.java | 81 ++ .../actions/VoyageCommonsVoyageImportAction.java | 2 +- .../VoyageResultsCellImportDataActionSupport.java | 109 +-- ...ndSpeciesCategoryAndLengthCellImportAction.java | 3 +- ...EchotypeAndSpeciesCategoryCellImportAction.java | 3 +- ...oyageResultsEsduByEchotypeCellImportAction.java | 4 +- ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 3 +- .../VoyageResultsImportDataActionSupport.java | 52 +- .../VoyageResultsMapFishCellImportAction.java | 4 +- .../VoyageResultsMapOtherCellImportAction.java | 4 +- ...VoyageResultsRegionAssociationImportAction.java | 4 - .../actions/VoyageResultsRegionImportAction.java | 4 +- .../VoyageResultsRegionResultsImportAction.java | 147 +--- .../VoyageResultsVoyageEchotypeImportAction.java | 121 +-- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 4 +- ...geResultsVoyageLengthWeightKeyImportAction.java | 4 +- ...tion.java => ImportAcousticsConfiguration.java} | 21 +- ...java => ImportResultsConfigurationSupport.java} | 30 +- ...va => MooringAcousticsImportConfiguration.java} | 31 +- ...ncillaryInstrumentationImportConfiguration.java | 53 ++ ... MooringCommonsMooringImportConfiguration.java} | 31 +- ... => MooringImportDataConfigurationSupport.java} | 20 +- .../MooringResultsImportConfiguration.java | 91 +++ .../VoyageAcousticsImportConfiguration.java | 198 +---- ...ncillaryInstrumentationImportConfiguration.java | 53 ++ .../VoyageCommonsImportConfiguration.java | 9 +- .../VoyageResultsImportConfiguration.java | 32 +- .../contexts/ImportDataContextSupport.java | 34 +- ...aContext.java => ImportResultsDataContext.java} | 42 +- ...java => MooringAcousticsImportDataContext.java} | 26 +- ...sAncillaryInstrumentationImportDataContext.java | 69 ++ ...=> MooringCommonsMooringImportDataContext.java} | 16 +- .../contexts/MooringResultsImportDataContext.java | 81 ++ .../contexts/VoyageAcousticsImportDataContext.java | 52 +- ...sAncillaryInstrumentationImportDataContext.java | 71 ++ .../contexts/VoyageImportDataContextSupport.java | 29 +- .../contexts/VoyageResultsImportDataContext.java | 206 +---- ...rtModel.java => AcousticImportExportModel.java} | 138 ++-- ...ousticImportRow.java => AcousticImportRow.java} | 20 +- .../csv/AncillaryInstrumentationImportRow.java | 55 ++ ...sAncillaryInstrumentationImportExportModel.java | 60 ++ ...ngCommonsAncillaryInstrumentationImportRow.java | 59 ++ .../MooringCommonsMooringImportExportModel.java | 93 +++ ...> MooringResultsEchotypeImportExportModel.java} | 36 +- .../csv/MooringResultsEchotypeImportRow.java | 73 ++ ...chotypeAndSpeciesCategoryImportExportModel.java | 94 +++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 30 +- ...ringResultsEsduByEchotypeImportExportModel.java | 83 ++ ... => MooringResultsEsduByEchotypeImportRow.java} | 32 +- ...mportRow.java => ResultsEchotypeImportRow.java} | 38 +- ...sAncillaryInstrumentationImportExportModel.java | 63 ++ ...geCommonsAncillaryInstrumentationImportRow.java | 75 ++ ...hotypeAndSpeciesCategoryAndLengthImportRow.java | 19 +- ...sEsduByEchotypeAndSpeciesCategoryImportRow.java | 19 +- .../csv/VoyageResultsEsduByEchotypeImportRow.java | 21 +- ...esultsEsduBySpeciesAndAgeCategoryImportRow.java | 19 +- .../VoyageResultsRegionCellResultImportRow.java | 21 +- ...yageResultsVoyageEchotypeImportExportModel.java | 5 +- .../csv/VoyageResultsVoyageEchotypeImportRow.java | 59 +- .../strategy/AbstractImportDbStrategy.java | 38 +- .../importdb/strategy/FreeImportDbStrategy.java | 22 +- .../strategy/ReferentialImportDbStrategy.java | 4 +- .../service/removedata/RemoveDataService.java | 63 +- .../strategy/AbstractRemoveDataStrategy.java | 109 +-- .../strategy/AcousticRemoveDataStrategy.java | 16 +- .../strategy/CatchesRemoveDataStrategy.java | 8 +- .../strategy/CommonAllRemoveDataStrategy.java | 16 +- ...ncillaryInstrumentationRemoveDataStrategy.java} | 50 +- .../strategy/CommonTransectRemoveDataStrategy.java | 19 +- .../strategy/CommonTransitRemoveDataStrategy.java | 17 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 16 +- .../strategy/DummyRemoveDataStrategy.java | 59 ++ .../strategy/LegacyVoyageRemoveDataStrategy.java | 13 +- ...java => MooringAcousticRemoveDataStrategy.java} | 52 +- ...ncillaryInstrumentationRemoveDataStrategy.java} | 48 +- ...trategy.java => MooringRemoveDataStrategy.java} | 62 +- ...va => MooringResultEsduRemoveDataStrategy.java} | 18 +- .../strategy/MooringResultsRemoveDataStrategy.java | 105 +++ .../strategy/OperationRemoveDataStrategy.java | 9 +- .../strategy/ResultEsduRemoveDataStrategy.java | 9 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 9 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 9 +- .../strategy/ResultRegionRemoveDataStrategy.java | 9 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 13 +- .../i18n/echobase-services_en_GB.properties | 11 +- .../i18n/echobase-services_fr_FR.properties | 11 +- .../echobase/services/EchoBaseServiceFixtures.java | 20 + .../services/EchoBaseTestServiceSupport.java | 7 + .../echobase/services/ImportDataFixtures.java | 29 + .../services/MigrateImportDataDatabasesIT.java | 10 + .../importdata/AbstractImportDataServiceIT.java | 33 +- ...IT.java => MooringAcousticImportServiceIT.java} | 25 +- ...onsAncillaryInstrumentationImportServiceIT.java | 72 ++ .../MooringCommonsMooringImportServiceIT.java | 71 ++ ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 35 +- ...esultsEsduCellOnlyEchotypeImportServiceIT.java} | 33 +- ...eIT.java => MooringResultsImportServiceIT.java} | 28 +- ...onsAncillaryInstrumentationImportServiceIT.java | 72 ++ ...AndSpeciesCategoryAndLengthImportServiceIT.java | 2 +- ...ciesCategoryAndLength_SmallImportServiceIT.java | 2 +- ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 2 +- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 2 +- ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 2 +- .../VoyageResultsRegionCellImportServiceIT.java | 2 +- ...VoyageResultsRegionCell_AllImportServiceIT.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 208 ++++- ...llaryInstrumentationRemoveDataServiceTest.java} | 30 +- .../removedata/CommonAllRemoveDataServiceTest.java | 1 + .../CommonTransectRemoveDataServiceTest.java | 1 + .../CommonVoyageRemoveDataServiceTest.java | 1 + ...a => MooringAcousticRemoveDataServiceTest.java} | 23 +- ...Test.java => MooringRemoveDataServiceTest.java} | 33 +- ...=> MooringResultEsduRemoveDataServiceTest.java} | 20 +- ...va => MooringResultsRemoveDataServiceTest.java} | 20 +- .../resources/echobase-services-test.properties | 4 +- .../common/ancillaryInstrumentation.csv.gz | Bin 0 -> 131 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 1006673 -> 991130 bytes .../import-data/echobase-catches.h2.db.gz | Bin 936199 -> 924955 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369833 -> 370149 bytes .../import-data/echobase-mooring-results.h2.db.gz | Bin 0 -> 930474 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 0 -> 925371 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318432 -> 318631 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 785038 -> 785190 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507447 -> 508067 bytes .../mooring/ancillaryInstrumentation.csv.gz | Bin 0 -> 96 bytes .../resources/import-data/mooring/mooring.csv.gz | Bin 0 -> 323 bytes .../byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2038 bytes .../result/mooring-esdu/byEchotype_small.csv.gz | Bin 0 -> 2798 bytes .../import-data/result/mooring/echotype.csv.gz | Bin 0 -> 593 bytes echobase-ui/pom.xml | 2 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 59 +- .../importData/AbstractConfigureImport.java | 4 +- .../actions/importData/AbstractLaunchImport.java | 4 +- .../importData/ConfigureAcousticImport.java | 1 - .../ConfigureAncillaryInstrumentationImport.java | 72 ++ ...rt.java => ConfigureMooringAcousticImport.java} | 33 +- ...igureMooringAncillaryInstrumentationImport.java | 72 ++ ...ort.java => ConfigureMooringCommonsImport.java} | 37 +- .../importData/ConfigureMooringResultsImport.java | 131 ++++ .../ui/actions/importData/CreateMooring.java | 119 +++ ...yage.java => GetDataProcessingsForMooring.java} | 33 +- .../importData/GetDataProcessingsForVoyage.java | 17 +- .../{ImportMode.java => ImportMooringMode.java} | 31 +- .../{ImportMode.java => ImportVoyageMode.java} | 9 +- ...a => LaunchAncillaryInstrumentationImport.java} | 18 +- ...mport.java => LaunchMooringAcousticImport.java} | 18 +- ...unchMooringAncillaryInstrumentationImport.java} | 18 +- ...Import.java => LaunchMooringCommonsImport.java} | 18 +- ...Import.java => LaunchMooringResultsImport.java} | 18 +- .../ui/actions/importData/SelectImportType.java | 40 +- .../ui/actions/removeData/ConfirmDelete.java | 18 +- .../echobase/ui/actions/removeData/ImportLogs.java | 21 +- .../echobase/ui/actions/workingDb/DashBoard.java | 25 +- .../ui/actions/workingDb/GetImportLogDetail.java | 13 +- .../workingDb/{GetVoyage.java => GetMooring.java} | 27 +- .../echobase/ui/actions/workingDb/GetVoyage.java | 15 +- .../main/resources/config/struts-importData.xml | 22 +- .../src/main/resources/config/struts-workingDb.xml | 17 +- echobase-ui/src/main/resources/echobase.properties | 2 + ... ConfigureMooringAcousticImport-validation.xml} | 10 +- ... => CreateMooring-createMooring-validation.xml} | 8 +- .../resources/i18n/echobase-ui_en_GB.properties | 59 +- .../resources/i18n/echobase-ui_fr_FR.properties | 47 +- ...=> configureAncillaryInstrumentationImport.jsp} | 14 +- ...port.jsp => configureMooringAcousticImport.jsp} | 19 +- ...igureMooringAncillaryInstrumentationImport.jsp} | 20 +- ...mport.jsp => configureMooringCommonsImport.jsp} | 32 +- .../importData/configureMooringResultsImport.jsp | 138 ++++ .../jsp/importData/configureResultsImport.jsp | 2 +- .../WEB-INF/jsp/importData/createMooring.jsp | 103 +++ ... => progressAncillaryInstrumentationImport.jsp} | 4 +- ...mport.jsp => progressMooringAcousticImport.jsp} | 2 +- ...gressMooringAncillaryInstrumentationImport.jsp} | 4 +- ...Import.jsp => progressMooringCommonsImport.jsp} | 4 +- ...Import.jsp => progressMooringResultsImport.jsp} | 2 +- ...sp => resultAncillaryInstrumentationImport.jsp} | 2 +- ...cImport.jsp => resultMooringAcousticImport.jsp} | 0 ...esultMooringAncillaryInstrumentationImport.jsp} | 2 +- ...onImport.jsp => resultMooringCommonsImport.jsp} | 2 +- ...tsImport.jsp => resultMooringResultsImport.jsp} | 0 .../WEB-INF/jsp/importData/selectImportType.jsp | 46 +- .../webapp/WEB-INF/jsp/removeData/importLogs.jsp | 21 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 310 +++++--- echobase-ui/src/main/webapp/css/screen.css | 12 +- echobase-ui/src/main/webapp/js/gridHelper.js | 19 +- pom.xml | 2 +- src/site/en/resources/model/Transverse.png | Bin 7038 -> 9110 bytes src/site/en/resources/model/dataAcoustic.png | Bin 28647 -> 34954 bytes src/site/en/resources/model/dataCatches.png | Bin 22230 -> 22223 bytes src/site/en/resources/model/dataCategory.png | Bin 9109 -> 9122 bytes src/site/en/resources/model/dataCommon.png | Bin 29204 -> 35480 bytes src/site/en/resources/model/dataEchotype.png | Bin 6838 -> 6860 bytes src/site/en/resources/model/dataLengthAgeKey.png | Bin 6799 -> 6754 bytes .../en/resources/model/dataLengthWeightKey.png | Bin 6655 -> 5566 bytes src/site/en/resources/model/dataMooring.png | Bin 0 -> 11778 bytes .../model/referenceAcousticInstrument.png | Bin 8939 -> 11654 bytes src/site/en/resources/model/referenceAll.png | Bin 65060 -> 71173 bytes .../resources/model/referenceAreaOfOperation.png | Bin 2692 -> 2703 bytes src/site/en/resources/model/referenceCellType.png | Bin 3224 -> 3225 bytes .../en/resources/model/referenceDataMetadata.png | Bin 8701 -> 8723 bytes .../en/resources/model/referenceDataQuality.png | Bin 1808 -> 1817 bytes .../en/resources/model/referenceDepthStratum.png | Bin 1873 -> 1880 bytes src/site/en/resources/model/referenceGear.png | Bin 12643 -> 12676 bytes src/site/en/resources/model/referenceMission.png | Bin 7820 -> 7830 bytes src/site/en/resources/model/referenceOperation.png | Bin 5851 -> 5858 bytes .../{ => en}/resources/model/referencePort.png | Bin src/site/en/resources/model/referenceProtocole.png | Bin 6551 -> 6576 bytes .../en/resources/model/referenceReferenceDatum.png | Bin 3127 -> 3134 bytes src/site/en/resources/model/referenceSample.png | Bin 7617 -> 7631 bytes src/site/en/resources/model/referenceSpecies.png | Bin 14230 -> 14498 bytes src/site/en/resources/model/referenceStrata.png | Bin 7890 -> 7903 bytes .../en/resources/model/referenceTSParameter.png | Bin 9923 -> 9934 bytes src/site/en/resources/model/referenceVessel.png | Bin 6636 -> 7237 bytes src/site/en/rst/importData.rst | 254 +++++- src/site/rst/importData.rst | 256 +++++- 274 files changed, 6106 insertions(+), 3456 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataAcousticProvider.java copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{GearMetadataValueImpl.java => MooringImpl.java} (61%) 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/{persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_906.java => entities/data/TransectImpl.java} (50%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Ports.java => AncillaryInstrumentations.java} (75%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_907.java} (89%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_908.java} (90%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_909.java} (90%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => 3.906-add-indexes.sql} (100%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => 3.908-0-drop-indexes.sql} (94%) copy echobase-domain/src/main/resources/migration/workingDb/{3.901-0-clean-importLog-table.sql => 3.909-0-mooring-echotype.sql} (84%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => h2/3.907-0-update-importLog-entityId.sql} (92%) copy echobase-domain/src/main/resources/migration/workingDb/{3.906-0-add-indexes.sql => pg/3.907-0-update-importLog-entityId.sql} (92%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/csv/{CellAble.java => ProviderAble.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedEchotypeAssociationException.java => DuplicatedAncillaryInstrumentationAssociationException.java} (71%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedVoyageException.java => DuplicatedMooringException.java} (77%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MismatchVoyageException.java => MismatchProviderException.java} (80%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MissionNameAlreadyExistException.java => MooringCodeAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MissionService.java => MooringService.java} (77%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => ResultsImportAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageAcousticsImportAction.java => ImportAcousticsActionSupport.java} (89%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportAncillaryInstrumentationActionSupport.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsCellImportDataActionSupport.java => ImportResultsCellDataActionSupport.java} (72%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsImportDataActionSupport.java => ImportResultsDataActionSupport.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsVoyageEchotypeImportAction.java => ImportResultsEchotypeActionSupport.java} (61%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringAcousticsImportAction.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/actions/{VoyageOperationsImportDataActionSupport.java => MooringCommonsImportDataActionSupport.java} (70%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringCommonsMooringImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringResultsCellImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/MooringResultsEchotypeImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java => MooringResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java} (51%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsEsduByEchotypeCellImportAction.java => MooringResultsEsduByEchotypeCellImportAction.java} (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsAncillaryInstrumentationImportAction.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageAcousticsImportConfiguration.java => ImportAcousticsConfiguration.java} (92%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => ImportResultsConfigurationSupport.java} (54%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringAcousticsImportConfiguration.java} (56%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/MooringCommonsAncillaryInstrumentationImportConfiguration.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringCommonsMooringImportConfiguration.java} (54%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/{VoyageImportDataConfigurationSupport.java => MooringImportDataConfigurationSupport.java} (67%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/MooringResultsImportConfiguration.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/configurations/VoyageCommonsAncillaryInstrumentationImportConfiguration.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageResultsImportDataContext.java => ImportResultsDataContext.java} (86%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageOperationsImportDataContext.java => MooringAcousticsImportDataContext.java} (59%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/MooringCommonsAncillaryInstrumentationImportDataContext.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/{VoyageOperationsImportDataContext.java => MooringCommonsMooringImportDataContext.java} (68%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/MooringResultsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageCommonsAncillaryInstrumentationImportDataContext.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageAcousticImportExportModel.java => AcousticImportExportModel.java} (62%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageAcousticImportRow.java => AcousticImportRow.java} (95%) 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 create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringCommonsMooringImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportExportModel.java => MooringResultsEchotypeImportExportModel.java} (55%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEchotypeImportRow.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java => MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeImportRow.java => MooringResultsEsduByEchotypeImportRow.java} (71%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsVoyageEchotypeImportRow.java => ResultsEchotypeImportRow.java} (69%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsAncillaryInstrumentationImportExportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsAncillaryInstrumentationImportRow.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultMapOtherRemoveDataStrategy.java => CommonAncillaryInstrumentationRemoveDataStrategy.java} (55%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/DummyRemoveDataStrategy.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{AcousticRemoveDataStrategy.java => MooringAcousticRemoveDataStrategy.java} (66%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultMapOtherRemoveDataStrategy.java => MooringAncillaryInstrumentationRemoveDataStrategy.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{CommonAllRemoveDataStrategy.java => MooringRemoveDataStrategy.java} (51%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultEsduRemoveDataStrategy.java => MooringResultEsduRemoveDataStrategy.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/MooringResultsRemoveDataStrategy.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageAcousticImportServiceIT.java => MooringAcousticImportServiceIT.java} (81%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/MooringCommonsAncillaryInstrumentationImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/MooringCommonsMooringImportServiceIT.java copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java} (65%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeImportServiceIT.java} (63%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsVoyageOnlyEchotypeImportServiceIT.java => MooringResultsImportServiceIT.java} (63%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAncillaryInstrumentationImportServiceIT.java copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{CatchesRemoveDataServiceTest.java => AncillaryInstrumentationRemoveDataServiceTest.java} (56%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{ResultMapRemoveOtherDataServiceTest.java => MooringAcousticRemoveDataServiceTest.java} (67%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{CatchesRemoveDataServiceTest.java => MooringRemoveDataServiceTest.java} (62%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{CatchesRemoveDataServiceTest.java => MooringResultEsduRemoveDataServiceTest.java} (75%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{ResultMapRemoveOtherDataServiceTest.java => MooringResultsRemoveDataServiceTest.java} (70%) create mode 100644 echobase-services/src/test/resources/import-data/common/ancillaryInstrumentation.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/echobase-mooring-results.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/echobase-mooring.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/mooring/ancillaryInstrumentation.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/mooring/mooring.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotype_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring/echotype.csv.gz create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureAncillaryInstrumentationImport.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ConfigureAcousticImport.java => ConfigureMooringAcousticImport.java} (68%) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringAncillaryInstrumentationImport.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchCatchesImport.java => ConfigureMooringCommonsImport.java} (51%) create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureMooringResultsImport.java create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/CreateMooring.java copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{GetDataProcessingsForVoyage.java => GetDataProcessingsForMooring.java} (74%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ImportMode.java => ImportMooringMode.java} (65%) rename echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{ImportMode.java => ImportVoyageMode.java} (84%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchOperationImport.java => LaunchAncillaryInstrumentationImport.java} (60%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchOperationImport.java => LaunchMooringAcousticImport.java} (69%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchOperationImport.java => LaunchMooringAncillaryInstrumentationImport.java} (59%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchAcousticImport.java => LaunchMooringCommonsImport.java} (64%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/{LaunchResultsImport.java => LaunchMooringResultsImport.java} (65%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/{GetVoyage.java => GetMooring.java} (70%) copy echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/{ConfigureAcousticImport-validation.xml => ConfigureMooringAcousticImport-validation.xml} (93%) copy echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/{CreateMission-createMission-validation.xml => CreateMooring-createMooring-validation.xml} (86%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureOperationImport.jsp => configureAncillaryInstrumentationImport.jsp} (78%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureAcousticImport.jsp => configureMooringAcousticImport.jsp} (87%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureOperationImport.jsp => configureMooringAncillaryInstrumentationImport.jsp} (70%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{configureCatchesImport.jsp => configureMooringCommonsImport.jsp} (64%) create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureMooringResultsImport.jsp create mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMooring.jsp copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressCommonImport.jsp => progressAncillaryInstrumentationImport.jsp} (87%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressAcousticImport.jsp => progressMooringAcousticImport.jsp} (93%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressCommonImport.jsp => progressMooringAncillaryInstrumentationImport.jsp} (87%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressCommonImport.jsp => progressMooringCommonsImport.jsp} (88%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{progressResultsImport.jsp => progressMooringResultsImport.jsp} (93%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultCommonImport.jsp => resultAncillaryInstrumentationImport.jsp} (92%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultAcousticImport.jsp => resultMooringAcousticImport.jsp} (100%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultCommonImport.jsp => resultMooringAncillaryInstrumentationImport.jsp} (92%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultCommonImport.jsp => resultMooringCommonsImport.jsp} (93%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/importData/{resultResultsImport.jsp => resultMooringResultsImport.jsp} (100%) create mode 100644 src/site/en/resources/model/dataMooring.png copy src/site/{ => en}/resources/model/referencePort.png (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.