This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 6f26a64d4f0226a83b9f24f01a530a12f0f8430f Merge: 311cdf9 51b9cbe Author: Maven Release <maven-release@codelutin.com> Date: Wed Jul 6 14:34:07 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-7' into 'master' 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 ++ .../echobase/entities/data/MooringImpl.java | 35 +- .../ifremer/echobase/entities/data/Moorings.java | 30 +- .../echobase/entities/data/TransectImpl.java | 61 ++ .../ifremer/echobase/entities/data/VoyageImpl.java | 31 + .../references/AncillaryInstrumentations.java | 28 +- .../WorkingDbMigrationCallBackForVersion3_907.java | 54 ++ .../WorkingDbMigrationCallBackForVersion3_908.java | 54 ++ .../WorkingDbMigrationCallBackForVersion3_909.java | 54 ++ .../i18n/echobase-domain_en_GB.properties | 10 + .../i18n/echobase-domain_fr_FR.properties | 10 + ...rate-voyage-ports.sql => 3.906-add-indexes.sql} | 8 +- ...e-voyage-ports.sql => 3.908-0-drop-indexes.sql} | 8 +- ...yage-ports.sql => 3.909-0-mooring-echotype.sql} | 9 +- .../workingDb/h2/3.905-0-update-model.sql | 4 + .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 4 + ...s.sql => 3.907-0-update-importLog-entityId.sql} | 8 +- .../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} | 7 +- 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} | 13 +- .../DuplicatedElementaryCellException.java | 5 +- .../importdata/DuplicatedEsduCellException.java | 5 +- ...eption.java => DuplicatedMooringException.java} | 10 +- .../importdata/EsduCellNotFoundException.java | 7 +- .../service/importdata/ImportDataFileResult.java | 10 +- .../service/importdata/ImportDataService.java | 178 ++++- ...ception.java => MismatchProviderException.java} | 6 +- ....java => MooringCodeAlreadyExistException.java} | 22 +- .../service/importdata/MooringService.java | 61 ++ ...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} | 19 +- .../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 +- .../ImportResultsConfigurationSupport.java | 54 ++ .../MooringAcousticsImportConfiguration.java} | 32 +- ...ncillaryInstrumentationImportConfiguration.java | 53 ++ .../MooringCommonsMooringImportConfiguration.java} | 32 +- .../MooringImportDataConfigurationSupport.java} | 29 +- .../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 +- .../importdata/MooringAcousticImportServiceIT.java | 112 +++ ...onsAncillaryInstrumentationImportServiceIT.java | 72 ++ .../MooringCommonsMooringImportServiceIT.java | 71 ++ ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 35 +- ...esultsEsduCellOnlyEchotypeImportServiceIT.java} | 33 +- .../importdata/MooringResultsImportServiceIT.java | 72 ++ ...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 ++++- ...illaryInstrumentationRemoveDataServiceTest.java | 56 ++ .../removedata/CommonAllRemoveDataServiceTest.java | 1 + .../CommonTransectRemoveDataServiceTest.java | 1 + .../CommonVoyageRemoveDataServiceTest.java | 1 + .../MooringAcousticRemoveDataServiceTest.java | 50 ++ .../removedata/MooringRemoveDataServiceTest.java | 59 ++ .../MooringResultEsduRemoveDataServiceTest.java | 48 ++ .../MooringResultsRemoveDataServiceTest.java | 49 ++ .../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 ++ .../importData/ConfigureMooringCommonsImport.java | 58 ++ .../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 +- .../LaunchAncillaryInstrumentationImport.java | 47 ++ .../importData/LaunchMooringAcousticImport.java | 47 ++ ...aunchMooringAncillaryInstrumentationImport.java | 47 ++ .../importData/LaunchMooringCommonsImport.java | 47 ++ .../importData/LaunchMooringResultsImport.java | 48 ++ .../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 | 126 +++ .../CreateMooring-createMooring-validation.xml | 41 + .../resources/i18n/echobase-ui_en_GB.properties | 59 +- .../resources/i18n/echobase-ui_fr_FR.properties | 47 +- .../configureAncillaryInstrumentationImport.jsp | 68 ++ .../importData/configureMooringAcousticImport.jsp | 120 +++ ...figureMooringAncillaryInstrumentationImport.jsp | 68 ++ ...tType.jsp => configureMooringCommonsImport.jsp} | 45 +- .../importData/configureMooringResultsImport.jsp | 138 ++++ .../jsp/importData/configureResultsImport.jsp | 2 +- .../WEB-INF/jsp/importData/createMooring.jsp | 103 +++ .../progressAncillaryInstrumentationImport.jsp | 40 + .../importData/progressMooringAcousticImport.jsp | 40 + ...ogressMooringAncillaryInstrumentationImport.jsp | 40 + .../importData/progressMooringCommonsImport.jsp | 40 + .../importData/progressMooringResultsImport.jsp | 40 + .../resultAncillaryInstrumentationImport.jsp | 28 + .../jsp/importData/resultMooringAcousticImport.jsp | 29 + ...resultMooringAncillaryInstrumentationImport.jsp | 28 + .../jsp/importData/resultMooringCommonsImport.jsp | 28 + .../jsp/importData/resultMooringResultsImport.jsp | 33 + .../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 src/site/en/resources/model/referencePort.png | Bin 0 -> 3465 bytes 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, 7732 insertions(+), 3287 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.