March 2016 - Echobase-commits - mailman.cloud.codelutin.com

branch feature/8170 updated (d4471e6 -> 520575f)
by codelutin.com scm March 31, 2016

March 31, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from d4471e6 Suppression des anciens services et code d'import de données + ajout de nouveaux tests d'import new cec5c70 Debut de mise en place d'un export lors de l'import new de7958c Suppression du domaine de tout ce qui concerne les csv (on retrouve ça partie service) new 13653b7 Optimisation des dépendances new de077c8 Renommages, mise en place context d'import new 520575f Renommages, mise en place context d'import (impacts dans les actions d'ui) The 5 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 520575f87bffda480c1de0c15e12850647f9e337 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 04:46:45 2016 +0200 Renommages, mise en place context d'import (impacts dans les actions d'ui) commit de077c867a7955258a7f2cbc224bdd6e0546b6d9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 04:46:30 2016 +0200 Renommages, mise en place context d'import commit 13653b7ace19faff5afdbc128443fb76a8b6d926 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 04:46:02 2016 +0200 Optimisation des dépendances commit de7958cef8bb6a5698fc52dc7e128e7d08905fcd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 31 04:45:43 2016 +0200 Suppression du domaine de tout ce qui concerne les csv (on retrouve ça partie service) commit cec5c7058ae40a11058b4f4430d61dcc9ef8f434 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 28 08:56:53 2016 +0200 Debut de mise en place d'un export lors de l'import Summary of changes: echobase-domain/pom.xml | 10 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 175 ---------- .../echobase/entities/data/CellTopiaDao.java | 6 - .../EchoBaseMigrationCallBackResolver.java | 2 +- .../echobase/persistence/EchoBaseDbMetaTest.java | 2 +- .../echobase/services/csv/CellValueFormatter.java | 115 +++++++ .../echobase/services}/csv/CellValueParser.java | 29 +- .../echobase/services}/csv/ChainValueParser.java | 13 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 337 ++++++++++++++++++++ .../ifremer/echobase/services/csv/ResultAble.java | 23 ++ .../services/csv/ResultValueFormatter.java | 33 +- .../echobase/services/csv/ResultValueGetter.java | 29 ++ .../echobase/services}/csv/ResultValueParser.java | 9 +- .../echobase/services/csv/ResultValueSetter.java | 17 + .../services/csv/ValueFormatterByFunction.java | 24 ++ .../echobase/services/service/DbEditorService.java | 2 +- .../services/service/UserDbPersistenceService.java | 101 +++--- .../service/exportCoser/IndicatorExportModel.java | 2 +- .../exportCoser/RawDataCatchExportModel.java | 2 +- .../exportCoser/RawDataSizeExportModel.java | 4 +- .../exportCoser/RawDataStrataExportModel.java | 2 +- .../service/exportCoser/SpeciesExportModel.java | 2 +- .../service/exportquery/ExportQueryCsvModel.java | 2 +- .../service/importdata/ImportDataFileResult.java | 32 +- .../service/importdata/ImportDataResult.java | 3 +- .../service/importdata/ImportDataService.java | 278 ++++++++-------- .../service/importdata/ResultCategoryCache.java | 93 ++++++ .../service/importdata/SpeciesCategoryCache.java | 82 +++++ .../importdata/actions/AbstractImportAction.java | 352 --------------------- .../actions/BiometrySampleImportAction.java | 136 -------- .../actions/GearMetadataImportAction.java | 100 ------ .../actions/ImportDataActionSupport.java | 167 ++++++++++ .../importdata/actions/OperationImportAction.java | 104 ------ .../actions/OperationMetadataImportAction.java | 94 ------ .../actions/RegionAssociationImportAction.java | 84 ----- .../importdata/actions/RegionImportAction.java | 118 ------- ...EchotypeAndSpeciesCategoryCellImportAction.java | 134 -------- .../ResultsEsduByEchotypeCellImportAction.java | 118 ------- ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 138 -------- ...EsduSpeciesAndSizeCategoryCellImportAction.java | 140 -------- .../actions/ResultsMapFishCellImportAction.java | 194 ------------ .../actions/ResultsMapOtherCellImportAction.java | 168 ---------- .../actions/ResultsRegionImportAction.java | 126 -------- .../ResultsVoyageLengthAgeKeyImportAction.java | 95 ------ .../ResultsVoyageLengthWeightKeyImportAction.java | 109 ------- .../importdata/actions/SubSampleImportAction.java | 151 --------- ...ction.java => VoyageAcousticsImportAction.java} | 64 ++-- .../VoyageAcousticsImportDataActionSupport.java | 18 ++ .../VoyageCatchesBiometrySampleImportAction.java | 109 +++++++ .../VoyageCatchesImportDataActionSupport.java | 57 ++++ .../VoyageCatchesSubSampleImportAction.java | 121 +++++++ ...a => VoyageCatchesTotalSampleImportAction.java} | 70 ++-- .../VoyageCommonsImportDataActionSupport.java | 18 ++ ...java => VoyageCommonsTransectImportAction.java} | 47 +-- ....java => VoyageCommonsTransitImportAction.java} | 43 +-- ...n.java => VoyageCommonsVoyageImportAction.java} | 38 +-- .../VoyageOperationsGearMetadataImportAction.java | 68 ++++ .../VoyageOperationsImportDataActionSupport.java | 18 ++ .../VoyageOperationsOperationImportAction.java | 86 +++++ ...ageOperationsOperationMetadataImportAction.java | 68 ++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 80 +++++ ...oyageResultsEsduByEchotypeCellImportAction.java | 77 +++++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 98 ++++++ ...EsduSpeciesAndSizeCategoryCellImportAction.java | 100 ++++++ .../VoyageResultsImportDataActionSupport.java | 64 ++++ .../VoyageResultsMapFishCellImportAction.java | 141 +++++++++ .../VoyageResultsMapOtherCellImportAction.java | 132 ++++++++ ...VoyageResultsRegionAssociationImportAction.java | 65 ++++ .../actions/VoyageResultsRegionImportAction.java | 89 ++++++ .../VoyageResultsRegionResultsImportAction.java | 81 +++++ ...> VoyageResultsVoyageEchotypeImportAction.java} | 46 +-- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 73 +++++ ...geResultsVoyageLengthWeightKeyImportAction.java | 82 +++++ .../ImportDataConfigurationSupport.java} | 15 +- .../VoyageAcousticsImportConfiguration.java} | 31 +- .../VoyageCatchesImportConfiguration.java} | 6 +- .../VoyageCommonsImportConfiguration.java} | 29 +- .../VoyageImportDataConfigurationSupport.java} | 18 +- .../VoyageOperationsImportConfiguration.java} | 6 +- .../VoyageResultsImportConfiguration.java} | 32 +- .../contexts/ImportDataContextSupport.java | 234 ++++++++++++++ .../contexts/VoyageAcousticsImportDataContext.java | 20 ++ .../contexts/VoyageCatchesImportDataContext.java | 121 +++++++ .../contexts/VoyageCommonsImportDataContext.java | 20 ++ .../contexts/VoyageImportDataContext.java | 112 +++++++ .../VoyageOperationsImportDataContext.java | 20 ++ .../contexts/VoyageResultsImportDataContext.java | 194 ++++++++++++ .../importdata/csv/AcousticImportExportModel.java | 223 +++++++++++++ .../importdata/csv/AcousticImportModel.java | 136 -------- .../service/importdata/csv/AcousticImportRow.java | 2 +- .../csv/BiometrySampleImportExportModel.java | 72 +++++ .../importdata/csv/BiometrySampleImportModel.java | 60 ---- .../importdata/csv/BiometrySampleImportRow.java | 2 +- .../csv/EchoBaseImportExportModelSupport.java | 41 +++ .../importdata/csv/EchotypeImportExportModel.java | 71 +++++ .../importdata/csv/EchotypeImportModel.java | 58 ---- .../service/importdata/csv/EchotypeImportRow.java | 9 +- ...chotypeAndSpeciesCategoryImportExportModel.java | 99 ++++++ ...ultByEchotypeAndSpeciesCategoryImportModel.java | 88 ------ ...esultByEchotypeAndSpeciesCategoryImportRow.java | 11 +- .../csv/EsduResultByEchotypeImportExportModel.java | 91 ++++++ .../csv/EsduResultByEchotypeImportModel.java | 79 ----- .../csv/EsduResultByEchotypeImportRow.java | 6 +- ...ltBySpeciesAndAgeCategoryImportExportModel.java | 97 ++++++ ...duResultBySpeciesAndAgeCategoryImportModel.java | 83 ----- ...EsduResultBySpeciesAndAgeCategoryImportRow.java | 11 +- ...tBySpeciesAndSizeCategoryImportExportModel.java | 97 ++++++ ...uResultBySpeciesAndSizeCategoryImportModel.java | 83 ----- ...sduResultBySpeciesAndSizeCategoryImportRow.java | 11 +- .../csv/GearMetadataValueImportExportModel.java | 72 +++++ .../csv/GearMetadataValueImportModel.java | 62 ---- .../importdata/csv/GearMetadataValueImportRow.java | 7 +- .../csv/LengthAgeKeyImportExportModel.java | 75 +++++ .../importdata/csv/LengthAgeKeyImportModel.java | 60 ---- .../importdata/csv/LengthAgeKeyImportRow.java | 9 +- .../csv/LengthWeightKeyImportExportModel.java | 74 +++++ .../importdata/csv/LengthWeightKeyImportModel.java | 60 ---- .../importdata/csv/LengthWeightKeyImportRow.java | 13 +- .../importdata/csv/MapCellImportExportModel.java | 109 +++++++ .../service/importdata/csv/MapCellImportModel.java | 125 -------- .../service/importdata/csv/MapCellImportRow.java | 91 +++--- .../importdata/csv/OperationImportExportModel.java | 84 +++++ .../importdata/csv/OperationImportModel.java | 65 ---- .../service/importdata/csv/OperationImportRow.java | 6 +- .../OperationMetadataValueImportExportModel.java | 68 ++++ .../csv/OperationMetadataValueImportModel.java | 57 ---- .../csv/OperationMetadataValueImportRow.java | 7 +- .../RegionCellAssociationImportExportModel.java | 64 ++++ .../csv/RegionCellAssociationImportModel.java | 53 ---- .../csv/RegionCellAssociationImportRow.java | 18 +- .../csv/RegionCellImportExportModel.java | 71 +++++ .../importdata/csv/RegionCellImportModel.java | 58 ---- .../importdata/csv/RegionCellImportRow.java | 30 +- .../csv/RegionCellResultImportExportModel.java | 96 ++++++ .../csv/RegionCellResultImportModel.java | 84 ----- .../importdata/csv/RegionCellResultImportRow.java | 6 +- .../importdata/csv/SubSampleImportExportModel.java | 87 +++++ .../importdata/csv/SubSampleImportModel.java | 70 ---- .../service/importdata/csv/SubSampleImportRow.java | 10 +- .../csv/TotalSampleImportExportModel.java | 79 +++++ .../importdata/csv/TotalSampleImportModel.java | 63 ---- .../importdata/csv/TotalSampleImportRow.java | 12 +- .../importdata/csv/TransectImportExportModel.java | 93 ++++++ .../importdata/csv/TransectImportModel.java | 74 ----- .../service/importdata/csv/TransectImportRow.java | 6 +- .../importdata/csv/TransitImportExportModel.java | 71 +++++ .../service/importdata/csv/TransitImportModel.java | 53 ---- .../service/importdata/csv/TransitImportRow.java | 7 +- .../importdata/csv/VoyageImportExportModel.java | 69 ++++ .../service/importdata/csv/VoyageImportModel.java | 49 --- .../fr/ifremer/echobase/services/FixCellsIT.java | 10 +- .../importdata/AbstractImportDataServiceIT.java | 5 +- .../importdata/AcousticImportServiceIT.java | 5 +- .../service/importdata/CatchesImportServiceIT.java | 5 +- .../CatchesImportServiceOnlyBiometrySampleIT.java | 5 +- .../CatchesImportServiceOnlySubSampleIT.java | 5 +- .../CatchesImportServiceOnlyTotalSampleIT.java | 5 +- .../importdata/CommonAllImportServiceIT.java | 5 +- .../importdata/CommonTransectImportServiceIT.java | 5 +- .../importdata/CommonTransitImportServiceIT.java | 5 +- .../importdata/CommonVoyageImportServiceIT.java | 5 +- .../importdata/OperationImportServiceIT.java | 5 +- .../importdata/ResultsEsduCellImportServiceIT.java | 19 +- .../ResultsMapFishCellImportServiceIT.java | 5 +- .../ResultsMapOtherCellImportServiceIT.java | 5 +- .../ResultsRegionCellImportServiceIT.java | 5 +- .../importdata/ResultsVoyageImportServiceIT.java | 5 +- .../ResultsVoyageImportServiceOnlyEchotypeIT.java | 5 +- ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 5 +- ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 5 +- .../removedata/AbstractRemoveDataServiceTest.java | 50 +-- echobase-ui/pom.xml | 15 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 2 +- .../importData/AbstractConfigureImport.java | 4 +- .../actions/importData/AbstractLaunchImport.java | 4 +- .../importData/ConfigureAcousticImport.java | 12 +- .../actions/importData/ConfigureCatchesImport.java | 12 +- .../actions/importData/ConfigureCommonImport.java | 20 +- .../importData/ConfigureOperationImport.java | 12 +- .../actions/importData/ConfigureResultsImport.java | 12 +- .../actions/importData/LaunchAcousticImport.java | 10 +- .../ui/actions/importData/LaunchCatchesImport.java | 10 +- .../ui/actions/importData/LaunchCommonImport.java | 10 +- .../actions/importData/LaunchOperationImport.java | 10 +- .../ui/actions/importData/LaunchResultsImport.java | 10 +- pom.xml | 14 +- 186 files changed, 5870 insertions(+), 4921 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellValueFormatter.java rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/CellValueParser.java (76%) rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/ChainValueParser.java (86%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchoBaseCsvUtil.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultAble.java copy echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java => echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueFormatter.java (57%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueGetter.java rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/ResultValueParser.java (90%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueSetter.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ValueFormatterByFunction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultCategoryCache.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SpeciesCategoryCache.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/AbstractImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/BiometrySampleImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/GearMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/OperationImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/OperationMetadataImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/RegionAssociationImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/RegionImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduByEchotypeCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduSpeciesAndAgeCategoryCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduSpeciesAndSizeCategoryCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsMapFishCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsMapOtherCellImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsRegionImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageLengthAgeKeyImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageLengthWeightKeyImportAction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/SubSampleImportAction.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{AcousticImportAction.java => VoyageAcousticsImportAction.java} (90%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesSubSampleImportAction.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{TotalSampleImportAction.java => VoyageCatchesTotalSampleImportAction.java} (54%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsImportDataActionSupport.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{CommonTransectImportAction.java => VoyageCommonsTransectImportAction.java} (58%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{CommonTransitImportAction.java => VoyageCommonsTransitImportAction.java} (50%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{CommonVoyageImportAction.java => VoyageCommonsVoyageImportAction.java} (62%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsGearMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndSizeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionAssociationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{ResultsVoyageEchotypeImportAction.java => VoyageResultsVoyageEchotypeImportAction.java} (55%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthAgeKeyImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthWeightKeyImportAction.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AbstractImportConfiguration.java => configurations/ImportDataConfigurationSupport.java} (86%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AcousticImportConfiguration.java => configurations/VoyageAcousticsImportConfiguration.java} (95%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportConfiguration.java => configurations/VoyageCatchesImportConfiguration.java} (90%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CommonImportConfiguration.java => configurations/VoyageCommonsImportConfiguration.java} (95%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/{exportquery/ExportQueryNameAlreadyExistException.java => importdata/configurations/VoyageImportDataConfigurationSupport.java} (66%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{OperationImportConfiguration.java => configurations/VoyageOperationsImportConfiguration.java} (90%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsImportConfiguration.java => configurations/VoyageResultsImportConfiguration.java} (96%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageAcousticsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageCatchesImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageCommonsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageOperationsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageResultsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchoBaseImportExportModelSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/8170 updated (a6987a6 -> d4471e6)
by codelutin.com scm March 26, 2016

March 26, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from a6987a6 Utilisation du nouveu service d'import de données dans les actions d'ui new d4471e6 Suppression des anciens services et code d'import de données + ajout de nouveaux tests d'import 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 d4471e615ec77772397def30a1e36c0d005d801b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 26 14:43:44 2016 +0100 Suppression des anciens services et code d'import de données + ajout de nouveaux tests d'import Summary of changes: .../services/service/UserDbPersistenceService.java | 44 ++ .../importdata/AbstractImportConfiguration.java | 18 - .../importdata/AbstractImportDataService.java | 409 ------------ .../service/importdata/AcousticImportResult.java | 57 -- .../service/importdata/AcousticImportService.java | 725 --------------------- .../service/importdata/CatchesImportService.java | 433 ------------ .../service/importdata/CommonAllImportService.java | 68 -- .../service/importdata/CommonImportService.java | 101 --- .../importdata/CommonTransectImportService.java | 137 ---- .../importdata/CommonTransitImportService.java | 113 ---- .../importdata/CommonVoyageImportService.java | 121 ---- .../importdata/EchoBaseCsvFileImportResult.java | 60 -- .../service/importdata/ImportDataResult.java | 8 +- .../service/importdata/ImportDataService.java | 99 +-- .../service/importdata/OperationImportService.java | 254 -------- .../importdata/ResultsEsduCellImportService.java | 433 ------------ .../service/importdata/ResultsImportService.java | 130 ---- .../ResultsMapFishCellImportService.java | 216 ------ .../ResultsMapOtherCellImportService.java | 188 ------ .../importdata/ResultsRegionCellImportService.java | 290 --------- .../importdata/ResultsVoyageImportService.java | 307 --------- .../importdata/actions/AbstractImportAction.java | 2 +- .../services/EchoBaseTestServiceSupport.java | 31 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 15 +- .../importdata/AbstractImportDataServiceIT.java | 13 +- .../importdata/AcousticImportServiceIT.java | 10 +- .../service/importdata/CatchesImportServiceIT.java | 92 +-- .../CatchesImportServiceOnlyBiometrySampleIT.java | 64 ++ .../CatchesImportServiceOnlySubSampleIT.java | 64 ++ .../CatchesImportServiceOnlyTotalSampleIT.java | 64 ++ .../importdata/CommonAllImportServiceIT.java | 13 +- .../importdata/CommonTransectImportServiceIT.java | 13 +- .../importdata/CommonTransitImportServiceIT.java | 13 +- .../importdata/CommonVoyageImportServiceIT.java | 13 +- .../importdata/OperationImportServiceIT.java | 13 +- .../importdata/ResultsEsduCellImportServiceIT.java | 37 +- .../ResultsMapFishCellImportServiceIT.java | 13 +- .../ResultsMapOtherCellImportServiceIT.java | 13 +- .../ResultsRegionCellImportServiceIT.java | 13 +- .../importdata/ResultsVoyageImportServiceIT.java | 88 +-- .../ResultsVoyageImportServiceOnlyEchotypeIT.java | 66 ++ ...sultsVoyageImportServiceOnlyLengthAgeKeyIT.java | 67 ++ ...tsVoyageImportServiceOnlyLengthWeightKeyIT.java | 67 ++ .../actions/importData/AbstractLaunchImport.java | 7 +- .../importData/GetDataProcessingsForVoyage.java | 5 +- .../actions/importData/LaunchAcousticImport.java | 3 +- .../ui/actions/importData/LaunchCatchesImport.java | 3 +- .../ui/actions/importData/LaunchCommonImport.java | 3 +- .../actions/importData/LaunchOperationImport.java | 3 +- .../ui/actions/importData/LaunchResultsImport.java | 3 +- 50 files changed, 569 insertions(+), 4453 deletions(-) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportResult.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyBiometrySampleIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlySubSampleIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceOnlyTotalSampleIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyEchotypeIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthAgeKeyIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceOnlyLengthWeightKeyIT.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8170 updated (355c51f -> a6987a6)
by codelutin.com scm March 26, 2016

March 26, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 355c51f Revue des import (utilisation java 7 API + reformat code) new a736122 Ajout d'un checkFile pour chaque importFile new a65f2e7 Mise en place d'une nouvelle API d'action d'import (pour traiter chaque import de fichier unitairement et non plus via des méthodes de services), du coup on ne va plus utiliser qu'un seul service d'import (grosse simplification) new a6987a6 Utilisation du nouveu service d'import de données dans les actions d'ui 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 a6987a619a7a77540db9db3760cac8aea323beb7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 26 14:00:48 2016 +0100 Utilisation du nouveu service d'import de données dans les actions d'ui commit a65f2e791ef3d8b9cd6d5b82c813db2f3f2f03d8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 26 14:00:13 2016 +0100 Mise en place d'une nouvelle API d'action d'import (pour traiter chaque import de fichier unitairement et non plus via des méthodes de services), du coup on ne va plus utiliser qu'un seul service d'import (grosse simplification) commit a73612211f351b96cc0167bb0ae1b31a1512837a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 26 13:58:47 2016 +0100 Ajout d'un checkFile pour chaque importFile Summary of changes: ....java => MigrationCallBackForVersion3_900.java} | 22 +- ...migration.workingDb.MigrationCallBackForVersion | 3 +- ...tFile-entity.sql => 3.900-0-add-check-file.sql} | 4 +- .../3.900-0-add-check-file.sql} | 4 +- echobase-domain/src/main/xmi/echobase.properties | 5 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89705 -> 89758 bytes .../services/service/UserDbPersistenceService.java | 30 +- ...ception.java => DuplicatedSampleException.java} | 10 +- .../service/importdata/ImportDataFileResult.java | 149 +++++ .../service/importdata/ImportDataResult.java | 38 ++ .../service/importdata/ImportDataService.java | 510 +++++++++++++++++ ...ommonImportService.java => MissionService.java} | 48 +- ...ava => NoTransitFoundBetweenDateException.java} | 6 +- .../AbstractImportAction.java} | 343 +++++------- .../importdata/actions/AcousticImportAction.java | 616 +++++++++++++++++++++ .../actions/BiometrySampleImportAction.java | 136 +++++ .../actions/CommonTransectImportAction.java | 121 ++++ .../actions/CommonTransitImportAction.java | 100 ++++ .../actions/CommonVoyageImportAction.java | 100 ++++ .../actions/GearMetadataImportAction.java | 100 ++++ .../importdata/actions/OperationImportAction.java | 104 ++++ .../actions/OperationMetadataImportAction.java | 94 ++++ .../actions/RegionAssociationImportAction.java | 84 +++ .../importdata/actions/RegionImportAction.java | 118 ++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 134 +++++ .../ResultsEsduByEchotypeCellImportAction.java | 118 ++++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 138 +++++ ...EsduSpeciesAndSizeCategoryCellImportAction.java | 140 +++++ .../actions/ResultsMapFishCellImportAction.java | 194 +++++++ .../actions/ResultsMapOtherCellImportAction.java | 168 ++++++ .../actions/ResultsRegionImportAction.java | 126 +++++ .../actions/ResultsVoyageEchotypeImportAction.java | 128 +++++ .../ResultsVoyageLengthAgeKeyImportAction.java | 95 ++++ .../ResultsVoyageLengthWeightKeyImportAction.java | 109 ++++ .../importdata/actions/SubSampleImportAction.java | 151 +++++ .../actions/TotalSampleImportAction.java | 162 ++++++ .../importdata/AbstractImportDataServiceIT.java | 28 +- .../importdata/AcousticImportServiceIT.java | 2 +- .../service/importdata/CatchesImportServiceIT.java | 8 +- .../importdata/CommonAllImportServiceIT.java | 4 +- .../importdata/CommonTransectImportServiceIT.java | 4 +- .../importdata/CommonTransitImportServiceIT.java | 4 +- .../importdata/CommonVoyageImportServiceIT.java | 4 +- .../importdata/OperationImportServiceIT.java | 2 +- .../importdata/ResultsEsduCellImportServiceIT.java | 8 +- .../ResultsMapFishCellImportServiceIT.java | 2 +- .../ResultsMapOtherCellImportServiceIT.java | 2 +- .../ResultsRegionCellImportServiceIT.java | 2 +- .../importdata/ResultsVoyageImportServiceIT.java | 8 +- .../removedata/AbstractRemoveDataServiceTest.java | 42 +- .../actions/importData/AbstractLaunchImport.java | 16 +- .../ui/actions/importData/CreateMission.java | 6 +- .../actions/importData/LaunchAcousticImport.java | 12 +- .../ui/actions/importData/LaunchCatchesImport.java | 12 +- .../ui/actions/importData/LaunchCommonImport.java | 12 +- .../actions/importData/LaunchOperationImport.java | 12 +- .../ui/actions/importData/LaunchResultsImport.java | 13 +- 57 files changed, 4237 insertions(+), 374 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6_1.java => MigrationCallBackForVersion3_900.java} (72%) copy echobase-domain/src/main/resources/migration/workingDb/h2/{2.7.2-1-add-importFile-entity.sql => 3.900-0-add-check-file.sql} (68%) copy echobase-domain/src/main/resources/migration/workingDb/{h2/2.7.2-1-add-importFile-entity.sql => pg/3.900-0-add-check-file.sql} (68%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedSampleException.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataFileResult.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataResult.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CommonImportService.java => MissionService.java} (57%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{TransitNotFoundException.java => NoTransitFoundBetweenDateException.java} (77%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AbstractImportDataService.java => actions/AbstractImportAction.java} (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/AcousticImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/BiometrySampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/CommonTransectImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/CommonTransitImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/CommonVoyageImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/GearMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/OperationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/OperationMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/RegionAssociationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/RegionImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduByEchotypeCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduSpeciesAndAgeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduSpeciesAndSizeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsMapFishCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsMapOtherCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsRegionImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageEchotypeImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageLengthAgeKeyImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageLengthWeightKeyImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/SubSampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/TotalSampleImportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/8170 created (now 355c51f)
by codelutin.com scm March 24, 2016

March 24, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 355c51f Revue des import (utilisation java 7 API + reformat code) This branch includes the following new commits: new 355c51f Revue des import (utilisation java 7 API + reformat code) 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 355c51f08147d01670037621b930e22d284d92c0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 24 08:59:15 2016 +0100 Revue des import (utilisation java 7 API + reformat code) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (aff2453 -> 09b7f7b)
by codelutin.com scm March 23, 2016

March 23, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from aff2453 Fix javadoc author annotation new 589f20d Fix assembly descriptors new 09b7f7b Revert "Refs #8168 nuiton-web 1.17" 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 09b7f7b73b30361084d658ec59a290fded68f280 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:55:52 2016 +0100 Revert "Refs #8168 nuiton-web 1.17" This reverts commit 9177faf3cf772e84df6129b6565e28819410df7c. commit 589f20d5b1d6515d420c1d562af9678d585952fe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:51:45 2016 +0100 Fix assembly descriptors Summary of changes: echobase-ui/src/main/assembly/embedded-zip.xml | 8 ++++---- echobase-ui/src/main/assembly/full-war.xml | 4 ++-- echobase-ui/src/main/assembly/lizmap-zip.xml | 4 ++-- pom.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (f058407 -> aff2453)
by codelutin.com scm March 23, 2016

March 23, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from f058407 Fixes #8169 Passage en java 8 new 9177faf Refs #8168 nuiton-web 1.17 new b01793c Refs #8168 postgresql 9.4.1208.jre7 new 8b79a13 Refs #8168 slf4j 1.7.19 new 6e77cc3 Refs #8168 sqlite-jdbc 3.8.11.2 new 81ef38a Refs #8168 i18n 3.4.1 new 9a81ac2 Refs #8168 nuiton-validator 3.0 new 5a28919 Refs #8168 nuiton-utils 3.0-rc-11 new 0add68f Refs #8168 nuiton-csv 3.0-rc-5 new 861ad25 Refs #8168 nuiton-config 3.0-rc-3 new 2a0486b Refs #8168 xwork-core + struts + struts plugins 2.3.28 new 72701b3 Refs #8168 httpcomponents:httpcore 4.4.4 new 1a78bd5 Refs #8168 httpcomponents:httpclient 4.5.2 new edc2e03 Refs #8168 commons-lang3 3.4 new 999dba4 Refs #8168 commons-collections4 4.1 new 33bcdb0 Refs #8168 struts2-jquery-plugins 3.7.1 new 6895be0 Refs #8168 guava 19.0 new 047bbd1 Refs #8168 gson 2.6.2 new 0fadc2e Revert "Refs #8168 struts2-jquery-plugins 3.7.1" new 1d0cb37 Revert "Refs #8168 xwork-core + struts + struts plugins 2.3.28" new 10fde42 Fix doc format new f293181 Replace some deprecated api calls new ce723d7 Use inline variables when possible new aff2453 Fix javadoc author annotation The 23 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 aff2453bf946e0daf6813f07c7aa7ed8ae55b260 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:34:33 2016 +0100 Fix javadoc author annotation commit ce723d797e541f33c5d759b40bb4ef5cc84c9511 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:32:55 2016 +0100 Use inline variables when possible commit f293181e99e187b38f595bcc936710a6484068c8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:31:49 2016 +0100 Replace some deprecated api calls commit 10fde427b912b864498aaf8ad46a0e6d31b00937 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:31:33 2016 +0100 Fix doc format commit 1d0cb377e6f2236d6304a3af1176ae5ec9a5adbc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:21:05 2016 +0100 Revert "Refs #8168 xwork-core + struts + struts plugins 2.3.28" This reverts commit 2a0486b3c738755564c0ed67acadf49f7161c64c. commit 0fadc2e8939e54f274d70af38fdbbd64a77fc0d2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:21:02 2016 +0100 Revert "Refs #8168 struts2-jquery-plugins 3.7.1" This reverts commit 33bcdb0ac895126b27574ce6db0af68b043eaa0b. commit 047bbd1f7be50a6c72f9b654159beeef3df86d3f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:08:29 2016 +0100 Refs #8168 gson 2.6.2 commit 6895be001c003843b96dbdc637045b2e8dbe13d9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:08:04 2016 +0100 Refs #8168 guava 19.0 commit 33bcdb0ac895126b27574ce6db0af68b043eaa0b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:07:41 2016 +0100 Refs #8168 struts2-jquery-plugins 3.7.1 commit 999dba4cfaa67d18a90f4ba3daf8f4d8cad8a0cc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:06:42 2016 +0100 Refs #8168 commons-collections4 4.1 commit edc2e034c6425051ed44e1dfb21ea23778e951e1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:06:09 2016 +0100 Refs #8168 commons-lang3 3.4 commit 1a78bd54d8e1f981a69c384ba2dbc235e5cb9d19 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:05:39 2016 +0100 Refs #8168 httpcomponents:httpclient 4.5.2 commit 72701b379adbf62ecd1d3a3b5e7e1710e089e3d0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:05:14 2016 +0100 Refs #8168 httpcomponents:httpcore 4.4.4 commit 2a0486b3c738755564c0ed67acadf49f7161c64c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:04:29 2016 +0100 Refs #8168 xwork-core + struts + struts plugins 2.3.28 commit 861ad252492faff4625a94eba39196a8a13f65d9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:03:03 2016 +0100 Refs #8168 nuiton-config 3.0-rc-3 commit 0add68f5e972e527eb53297ebfc8286718a6419f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:02:49 2016 +0100 Refs #8168 nuiton-csv 3.0-rc-5 commit 5a28919da27fdce1b97e04c078f641a053aac613 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:02:26 2016 +0100 Refs #8168 nuiton-utils 3.0-rc-11 commit 9a81ac28967c1cc9b70fdeb110ffe871da8b0267 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:01:57 2016 +0100 Refs #8168 nuiton-validator 3.0 commit 81ef38a771bda5c0abfcd746e5dedc4cca39d2d1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:01:27 2016 +0100 Refs #8168 i18n 3.4.1 commit 6e77cc35245a3bd2920bc6f0ab2f25c4cfe01ebd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 11:00:41 2016 +0100 Refs #8168 sqlite-jdbc 3.8.11.2 commit 8b79a13dcb7a59eadfee222ff683e7232e04335f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 10:59:48 2016 +0100 Refs #8168 slf4j 1.7.19 commit b01793c59f6a12a0e353fa5107e84b761a3db525 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 10:59:19 2016 +0100 Refs #8168 postgresql 9.4.1208.jre7 commit 9177faf3cf772e84df6129b6565e28819410df7c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 10:58:17 2016 +0100 Refs #8168 nuiton-web 1.17 Summary of changes: .../fr/ifremer/echobase/EchoBaseDateConverter.java | 5 +- .../echobase/config/EchoBaseConfiguration.java | 38 ++--- .../config/EchoBaseConfigurationOption.java | 2 +- .../fr/ifremer/echobase/entities/DriverType.java | 6 +- .../EchoBaseUserTopiaApplicationContext.java | 6 +- .../EchoBaseUserTopiaPersistenceContext.java | 3 +- .../echobase/entities/ExportQueryTopiaDao.java | 6 +- .../echobase/entities/data/CategoryTopiaDao.java | 6 +- .../echobase/entities/data/CellTopiaDao.java | 15 +- .../fr/ifremer/echobase/entities/data/Cells.java | 12 +- .../echobase/entities/references/CellTypes.java | 15 +- .../echobase/entities/references/Gears.java | 5 +- .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 3 +- .../echobase/persistence/EchoBaseEntityHelper.java | 13 +- .../EchobaseTopiaApplicationContexts.java | 3 +- .../echobase/persistence/JdbcConfiguration.java | 3 +- .../internalDb/MigrationCallBackForVersion2_2.java | 3 +- .../services/DefaultEchoBaseServiceContext.java | 3 +- .../echobase/services/EchoBaseServiceSupport.java | 2 +- .../echobase/services/service/CoserApiService.java | 3 +- .../echobase/services/service/DbEditorService.java | 12 +- .../services/service/DecoratorService.java | 3 +- .../services/service/UserDbPersistenceService.java | 167 +++++++-------------- .../echobase/services/service/UserService.java | 11 +- .../EmbeddedApplicationService.java | 2 +- .../service/exportCoser/ExportCoserService.java | 3 +- .../services/service/exportdb/ExportService.java | 19 +-- .../service/exportquery/ExportQueryService.java | 18 +-- .../service/exportquery/GenericSQLQuery.java | 10 +- .../importdata/AbstractImportDataService.java | 18 +-- .../service/importdata/csv/MapCellImportModel.java | 3 +- .../importdata/csv/RegionCellImportModel.java | 3 +- .../importdb/EchoBaseImportModelFactory.java | 10 +- .../importdb/strategy/EchoBaseImportStrategy.java | 3 +- .../strategy/AcousticRemoveDataStrategy.java | 11 +- .../strategy/CatchesRemoveDataStrategy.java | 6 +- .../strategy/CommonAllRemoveDataStrategy.java | 21 ++- .../strategy/CommonTransectRemoveDataStrategy.java | 15 +- .../strategy/CommonTransitRemoveDataStrategy.java | 17 +-- .../strategy/CommonVoyageRemoveDataStrategy.java | 21 ++- .../strategy/LegacyVoyageRemoveDataStrategy.java | 21 ++- .../strategy/OperationRemoveDataStrategy.java | 6 +- .../strategy/ResultEsduRemoveDataStrategy.java | 6 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 6 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 6 +- .../strategy/ResultRegionRemoveDataStrategy.java | 6 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 9 +- .../services/service/spatial/GisService.java | 3 +- .../services/service/spatial/LizmapRepository.java | 6 +- .../workingDb/WorkingDbConfigurationService.java | 7 +- .../services/FakeEchoBaseServiceContext.java | 6 +- .../removedata/AbstractRemoveDataServiceTest.java | 3 +- .../echobase/ui/EchoBaseApplicationContext.java | 14 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 12 +- .../echobase/ui/actions/EchoBaseActionSupport.java | 9 +- .../echobase/ui/actions/dbeditor/ExportTable.java | 2 +- .../echobase/ui/actions/dbeditor/GetEntity.java | 2 +- .../echobase/ui/actions/dbeditor/ImportTable.java | 2 +- .../ui/actions/embeddedApplication/Build.java | 5 +- .../ui/actions/embeddedApplication/Configure.java | 2 +- .../ifremer/echobase/ui/actions/user/GetUsers.java | 2 +- .../ui/interceptors/AbstractCheckInterceptor.java | 3 +- .../ui/interceptors/CheckLogguedInterceptor.java | 7 +- .../ui/interceptors/EchoBaseInjectInterceptor.java | 17 +-- .../validators/EchoBaseFieldValidatorSupport.java | 5 +- .../echobase/ui/validators/LoginValidator.java | 4 +- pom.xml | 34 ++--- src/site/en/rst/install.rst.vm | 1 + 68 files changed, 274 insertions(+), 457 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 23

branch develop updated (da8dcf6 -> f058407)
by codelutin.com scm March 23, 2016

March 23, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from da8dcf6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new f058407 Fixes #8169 Passage en java 8 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 f058407d490eb08e608fc25885c660b60b896ce8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Mar 23 10:56:16 2016 +0100 Fixes #8169 Passage en java 8 Summary of changes: pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch release/2.12.1 deleted (was 6deff84)
by codelutin.com scm March 23, 2016

March 23, 2016

This is an automated email from the git hooks/post-receive script. New change to branch release/2.12.1 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git was 6deff84 [jgitflow-maven-plugin]updating poms for branch'release/2.12.1' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag echobase-2.12.1 created (now 32ba1ea)
by codelutin.com scm March 23, 2016

March 23, 2016

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-2.12.1 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git at 32ba1ea (tag) tagging 21f703476504ad03766504ef3b29a59b40189e26 (commit) replaces echobase-2.12 tagged by Maven Release on Wed Mar 23 06:40:55 2016 +0100 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.12.1 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (bb56fe1 -> da8dcf6)
by codelutin.com scm March 23, 2016

March 23, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from bb56fe1 [jgitflow-maven-plugin]updating poms for 4.0-SNAPSHOT development new ca04cdd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds aade5e8 [jgitflow-maven-plugin]updating poms for 2.12.1 branch with snapshot versions new c972934 Stick to java 7 for this version new 6deff84 [jgitflow-maven-plugin]updating poms for branch'release/2.12.1' with non-snapshot versions new 21f7034 [jgitflow-maven-plugin]merging 'release/2.12.1' into 'master' new 83ddd64 [jgitflow-maven-plugin]merging 'master' into 'develop' new da8dcf6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 da8dcf69767628009c00f117370d8aece9c9da5d Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Mar 23 06:41:00 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 83ddd64db2651f94aecd0730f13b1a949f230563 Merge: ca04cdd 21f7034 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Mar 23 06:40:59 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit ca04cdd0776d18e5da90ba0d0b63bd3b12fc7d1d Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Mar 23 06:40:59 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 21f703476504ad03766504ef3b29a59b40189e26 Merge: f326335 6deff84 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Mar 23 06:40:53 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.12.1' into 'master' commit 6deff841c1aa7f25a962cff2bf407f7a49f1eae8 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Mar 23 06:38:58 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.12.1' with non-snapshot versions commit c9729343e296f85d48e656d755b3a69354758169 Author: Maven Release <maven-release(a)codelutin.com> Date: Wed Mar 23 06:38:45 2016 +0100 Stick to java 7 for this version Summary of changes: pom.xml | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6