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 a29df6b2e793803460600ce9fec924ae6a35144c Merge: 2fda67c 35ec2cf Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 08:42:06 2016 +0200 Retour sur develop (le modèle est stabilisé restera à effectuer les optimisations pour la génértion des fichiers d'export)" Merge branch 'feature/8170' into develop echobase-domain/pom.xml | 65 +- .../echobase/config/EchoBaseConfiguration.java | 8 + .../config/EchoBaseConfigurationOption.java | 4 + .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 175 ---- .../fr/ifremer/echobase/entities/DriverType.java | 21 +- .../EchoBaseInternalTopiaApplicationContext.java | 72 ++ .../EchoBaseUserTopiaApplicationContext.java | 92 ++- .../echobase/entities/EchoBaseUserTopiaDao.java | 6 +- .../echobase/{ => entities}/FixedH2Dialect.java | 22 +- .../echobase/entities/ImportFileIdTopiaDao.java | 37 + .../echobase/entities/ImportFileTopiaDao.java | 17 + .../echobase/entities/ImportLogTopiaDao.java | 16 + .../ifremer/echobase/entities/data/CellImpl.java | 12 +- .../echobase/entities/data/CellTopiaDao.java | 6 - .../ifremer/echobase/entities/data/DataImpl.java | 18 + .../fr/ifremer/echobase/entities/data/Datas.java | 41 + .../echobase/entities/data/OperationImpl.java | 22 +- .../echobase/entities/data/SampleDataImpl.java | 18 + .../echobase/entities/data/SampleDatas.java | 19 + .../ifremer/echobase/entities/data/SampleImpl.java | 18 + .../echobase/entities/references/CellTypeImpl.java | 15 +- .../entities/references/DataMetadataImpl.java | 13 +- .../echobase/entities/references/GearImpl.java | 17 + .../entities/references/SampleDataTypeImpl.java | 17 +- .../entities/references/SampleTypeImpl.java | 10 + .../echobase/persistence/EchoBaseEntityHelper.java | 100 +-- .../EchobaseTopiaApplicationContexts.java | 233 ------ .../EchoBaseMigrationCallBackResolver.java | 63 +- .../MigrationCallBackForVersionSupport.java | 75 ++ .../migration/MigrationCallbackSupport.java | 24 + ... InternalDbMigrationCallBackForVersion2_2.java} | 25 +- ...ernalDbMigrationCallBackForVersionSupport.java} | 25 +- ...lback.java => InternalDbMigrationCallback.java} | 23 +- ...> WorkingDbMigrationCallBackForVersion2_2.java} | 8 +- ...WorkingDbMigrationCallBackForVersion2_5_1.java} | 10 +- ...> WorkingDbMigrationCallBackForVersion2_6.java} | 16 +- ...WorkingDbMigrationCallBackForVersion2_6_1.java} | 12 +- ...WorkingDbMigrationCallBackForVersion2_7_2.java} | 12 +- ...WorkingDbMigrationCallBackForVersion3_900.java} | 33 +- .../WorkingDbMigrationCallBackForVersion3_901.java | 38 + ...rkingDbMigrationCallBackForVersionSupport.java} | 62 +- ...l.java => WorkingDbMigrationCallbackForH2.java} | 14 +- ...> WorkingDbMigrationCallbackForPostgresql.java} | 18 +- ...igration.internalDb.MigrationCallBackForVersion | 1 - ...migration.workingDb.MigrationCallBackForVersion | 5 - .../main/resources/echobase-internaldb.properties | 41 - .../main/resources/echobase-workingdb.properties | 41 - .../i18n/echobase-domain_en_GB.properties | 1 + .../i18n/echobase-domain_fr_FR.properties | 1 + .../workingDb/3.901-0-clean-importLog-table.sql | 2 + .../migration/workingDb/h2/3.900-0-fix-types.sql | 56 ++ .../h2/3.901-1-upgrade-importFile-table.sql | 10 + .../{ => pg}/2.5.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.5.1-1-postgis-view.sql | 0 .../workingDb/{ => pg}/2.6-0-postgis-view.sql | 0 .../{ => pg}/2.6.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.7.2-0-postgis-view.sql | 0 .../migration/workingDb/pg/3.900-0-fix-types.sql | 56 ++ .../pg/3.901-1-upgrade-importFile-table.sql | 30 + .../src/main/xmi/echobase-internal.properties | 5 +- echobase-domain/src/main/xmi/echobase.properties | 20 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89705 -> 90396 bytes .../echobase/persistence/EchoBaseDbMetaTest.java | 2 +- echobase-services/pom.xml | 2 +- .../echobase/services/csv/BatchCsvExport.java | 100 +++ .../fr/ifremer/echobase/services/csv/CellAble.java | 22 + .../echobase/services/csv/CellValueFormatter.java | 115 +++ .../echobase/services}/csv/CellValueParser.java | 29 +- .../echobase/services}/csv/ChainValueParser.java | 13 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 347 ++++++++ .../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 | 258 ++++-- .../EmbeddedApplicationService.java | 5 +- .../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 +- .../importdata/AbstractImportDataService.java | 452 ---------- .../service/importdata/AcousticImportResult.java | 57 -- .../service/importdata/AcousticImportService.java | 778 ------------------ .../service/importdata/AgeCategoryCache.java | 53 ++ .../service/importdata/CatchesImportService.java | 535 ------------ .../service/importdata/CommonAllImportService.java | 67 -- .../importdata/CommonTransectImportService.java | 158 ---- .../importdata/CommonTransitImportService.java | 123 --- .../importdata/CommonVoyageImportService.java | 133 --- ...ion.java => DataMetadataNotFoundException.java} | 13 +- ...ception.java => DuplicatedSampleException.java} | 16 +- .../importdata/EchoBaseCsvFileImportResult.java | 60 -- ...=> ElementaryCellWithoutDepthEndException.java} | 13 +- ...ception.java => EsduCellNotFoundException.java} | 15 +- ...va => EsduCellWithDepthEndFilledException.java} | 13 +- .../service/importdata/ImportDataFileResult.java | 164 ++++ .../service/importdata/ImportDataResult.java | 45 + .../service/importdata/ImportDataService.java | 382 +++++++++ .../service/importdata/ImportException.java | 4 +- .../MismatchAgeCategoryMeaningException.java | 19 + .../MismatchSizeCategoryMeaningException.java | 19 + ...ommonImportService.java => MissionService.java} | 53 +- ...va => MoreThanOnceVoyageToImportException.java} | 12 +- ...ava => NoTransitFoundBetweenDateException.java} | 14 +- ...ception.java => NoVoyageToImportException.java} | 12 +- .../service/importdata/OperationImportService.java | 284 ------- .../service/importdata/ResultCategoryCache.java | 93 +++ .../importdata/ResultsEsduCellImportService.java | 500 ----------- .../service/importdata/ResultsImportService.java | 131 --- .../ResultsMapFishCellImportService.java | 231 ------ .../ResultsMapOtherCellImportService.java | 204 ----- .../importdata/ResultsRegionCellImportService.java | 315 ------- .../ResultsVoyageImportAlreadyExistException.java | 8 +- .../importdata/ResultsVoyageImportService.java | 345 -------- .../service/importdata/SizeCategoryCache.java | 53 ++ .../service/importdata/SpeciesCategoryCache.java | 82 ++ ...ception.java => TransectNotFoundException.java} | 15 +- ...xception.java => TransitNotFoundException.java} | 14 +- .../actions/ImportDataActionSupport.java | 441 ++++++++++ .../actions/VoyageAcousticsImportAction.java | 915 +++++++++++++++++++++ .../VoyageAcousticsImportDataActionSupport.java | 18 + .../VoyageCatchesBiometrySampleImportAction.java | 157 ++++ .../VoyageCatchesImportDataActionSupport.java | 61 ++ .../VoyageCatchesSubSampleImportAction.java | 338 ++++++++ .../VoyageCatchesTotalSampleImportAction.java | 229 ++++++ .../VoyageCommonsImportDataActionSupport.java | 18 + .../actions/VoyageCommonsTransectImportAction.java | 127 +++ .../actions/VoyageCommonsTransitImportAction.java | 110 +++ .../actions/VoyageCommonsVoyageImportAction.java | 122 +++ .../VoyageOperationsGearMetadataImportAction.java | 115 +++ .../VoyageOperationsImportDataActionSupport.java | 18 + .../VoyageOperationsOperationImportAction.java | 121 +++ ...ageOperationsOperationMetadataImportAction.java | 114 +++ .../VoyageResultsCellImportDataActionSupport.java | 142 ++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 51 ++ ...oyageResultsEsduByEchotypeCellImportAction.java | 47 ++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 59 ++ ...EsduSpeciesAndSizeCategoryCellImportAction.java | 63 ++ .../VoyageResultsImportDataActionSupport.java | 69 ++ .../VoyageResultsMapFishCellImportAction.java | 231 ++++++ .../VoyageResultsMapOtherCellImportAction.java | 199 +++++ ...VoyageResultsRegionAssociationImportAction.java | 105 +++ .../actions/VoyageResultsRegionImportAction.java | 167 ++++ .../VoyageResultsRegionResultsImportAction.java | 189 +++++ .../VoyageResultsVoyageEchotypeImportAction.java | 144 ++++ ...oyageResultsVoyageLengthAgeKeyImportAction.java | 96 +++ ...geResultsVoyageLengthWeightKeyImportAction.java | 105 +++ .../ImportDataConfigurationSupport.java} | 33 +- .../VoyageAcousticsImportConfiguration.java} | 31 +- .../VoyageCatchesImportConfiguration.java} | 21 +- .../VoyageCommonsImportConfiguration.java} | 38 +- .../VoyageImportDataConfigurationSupport.java | 22 +- .../VoyageOperationsImportConfiguration.java} | 19 +- .../VoyageResultsImportConfiguration.java} | 95 +-- .../contexts/ImportDataContextSupport.java | 270 ++++++ .../contexts/VoyageAcousticsImportDataContext.java | 21 + .../contexts/VoyageCatchesImportDataContext.java | 122 +++ .../contexts/VoyageCommonsImportDataContext.java | 21 + .../contexts/VoyageImportDataContextSupport.java | 121 +++ .../VoyageOperationsImportDataContext.java | 21 + .../contexts/VoyageResultsImportDataContext.java | 214 +++++ .../importdata/csv/AcousticImportModel.java | 136 --- .../importdata/csv/BiometrySampleImportModel.java | 60 -- .../csv/EchoBaseImportExportModelSupport.java | 51 ++ .../importdata/csv/EchotypeImportModel.java | 58 -- ...ultByEchotypeAndSpeciesCategoryImportModel.java | 88 -- .../csv/EsduResultByEchotypeImportModel.java | 79 -- ...duResultBySpeciesAndAgeCategoryImportModel.java | 83 -- ...uResultBySpeciesAndSizeCategoryImportModel.java | 83 -- .../csv/GearMetadataValueImportModel.java | 62 -- .../importdata/csv/LengthAgeKeyImportModel.java | 60 -- .../importdata/csv/LengthWeightKeyImportModel.java | 60 -- .../service/importdata/csv/MapCellImportModel.java | 125 --- .../importdata/csv/OperationImportModel.java | 65 -- .../csv/OperationMetadataValueImportModel.java | 57 -- .../csv/RegionCellAssociationImportModel.java | 53 -- .../importdata/csv/RegionCellImportModel.java | 58 -- .../csv/RegionCellResultImportModel.java | 84 -- .../importdata/csv/SubSampleImportModel.java | 70 -- .../importdata/csv/TotalSampleImportModel.java | 63 -- .../importdata/csv/TransectImportModel.java | 74 -- .../service/importdata/csv/TransitImportModel.java | 53 -- .../csv/VoyageAcousticImportExportModel.java | 223 +++++ ...ImportRow.java => VoyageAcousticImportRow.java} | 93 ++- ...yageCatchesBiometrySampleImportExportModel.java | 71 ++ ...a => VoyageCatchesBiometrySampleImportRow.java} | 44 +- .../VoyageCatchesSubSampleImportExportModel.java | 87 ++ ...w.java => VoyageCatchesSubSampleImportRow.java} | 46 +- .../VoyageCatchesTotalSampleImportExportModel.java | 78 ++ ...java => VoyageCatchesTotalSampleImportRow.java} | 39 +- .../VoyageCommonsTransectImportExportModel.java | 92 +++ ...ow.java => VoyageCommonsTransectImportRow.java} | 120 ++- .../csv/VoyageCommonsTransitImportExportModel.java | 70 ++ ...Row.java => VoyageCommonsTransitImportRow.java} | 50 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 68 ++ .../service/importdata/csv/VoyageImportModel.java | 49 -- ...erationsGearMetadataValueImportExportModel.java | 72 ++ ...oyageOperationsGearMetadataValueImportRow.java} | 36 +- ...VoyageOperationsOperationImportExportModel.java | 84 ++ ...ava => VoyageOperationsOperationImportRow.java} | 67 +- ...onsOperationMetadataValueImportExportModel.java | 68 ++ ...OperationsOperationMetadataValueImportRow.java} | 40 +- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 +++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 73 +- ...yageResultsEsduByEchotypeImportExportModel.java | 83 ++ ...a => VoyageResultsEsduByEchotypeImportRow.java} | 53 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 91 ++ ...sultsEsduBySpeciesAndAgeCategoryImportRow.java} | 81 +- ...uBySpeciesAndSizeCategoryImportExportModel.java | 93 +++ ...ultsEsduBySpeciesAndSizeCategoryImportRow.java} | 81 +- .../VoyageResultsMapFishCellImportExportModel.java | 114 +++ ...java => VoyageResultsMapFishCellImportRow.java} | 127 +-- ...VoyageResultsMapOtherCellImportExportModel.java | 99 +++ ...ava => VoyageResultsMapOtherCellImportRow.java} | 131 ++- ...ultsRegionCellAssociationImportExportModel.java | 68 ++ ...yageResultsRegionCellAssociationImportRow.java} | 32 +- .../VoyageResultsRegionCellImportExportModel.java | 71 ++ ....java => VoyageResultsRegionCellImportRow.java} | 56 +- ...geResultsRegionCellResultImportExportModel.java | 93 +++ ...=> VoyageResultsRegionCellResultImportRow.java} | 79 +- ...yageResultsVoyageEchotypeImportExportModel.java | 73 ++ ...a => VoyageResultsVoyageEchotypeImportRow.java} | 44 +- ...ResultsVoyageLengthAgeKeyImportExportModel.java | 76 ++ ... VoyageResultsVoyageLengthAgeKeyImportRow.java} | 46 +- ...ultsVoyageLengthWeightKeyImportExportModel.java | 77 ++ ...yageResultsVoyageLengthWeightKeyImportRow.java} | 42 +- .../importdb/strategy/FreeImportDbStrategy.java | 13 +- .../service/removedata/RemoveDataService.java | 24 +- .../strategy/AbstractRemoveDataStrategy.java | 34 +- .../strategy/AcousticRemoveDataStrategy.java | 2 +- .../strategy/CatchesRemoveDataStrategy.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 2 +- .../strategy/CommonTransectRemoveDataStrategy.java | 2 +- .../strategy/CommonTransitRemoveDataStrategy.java | 2 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 2 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 2 +- .../strategy/OperationRemoveDataStrategy.java | 2 +- .../strategy/ResultEsduRemoveDataStrategy.java | 2 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 2 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 2 +- .../strategy/ResultRegionRemoveDataStrategy.java | 2 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 2 +- .../i18n/echobase-services_en_GB.properties | 5 + .../i18n/echobase-services_fr_FR.properties | 5 + .../echobase/services/EchoBaseServiceFixtures.java | 30 +- .../services/EchoBaseTestServiceSupport.java | 169 +--- .../services/FakeEchoBaseServiceContext.java | 73 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 23 +- .../echobase/services/ImportDataFixtures.java | 132 +++ .../services/MigrateImportDataDatabasesIT.java | 129 +++ .../EmbeddedApplicationServiceIT.java | 4 +- .../exportCoser/ExportCoserServiceTest.java | 3 +- .../service/exportdb/ExportDbServiceTest.java | 4 +- .../importdata/AbstractImportDataServiceIT.java | 236 +++--- .../service/importdata/CatchesImportServiceIT.java | 160 ---- .../importdata/CommonAllImportServiceIT.java | 92 --- .../importdata/CommonTransectImportServiceIT.java | 82 -- .../importdata/CommonTransitImportServiceIT.java | 87 -- .../importdata/CommonVoyageImportServiceIT.java | 83 -- .../importdata/OperationImportServiceIT.java | 83 -- .../importdata/ResultsEsduCellImportServiceIT.java | 191 ----- .../ResultsMapFishCellImportServiceIT.java | 80 -- .../ResultsMapOtherCellImportServiceIT.java | 79 -- .../ResultsRegionCellImportServiceIT.java | 92 --- .../importdata/ResultsVoyageImportServiceIT.java | 162 ---- ...eIT.java => VoyageAcousticImportServiceIT.java} | 73 +- .../VoyageCatchesAllImportServiceIT.java | 94 +++ .../VoyageCatchesImportServiceITSupport.java | 55 ++ ...geCatchesOnlyBiometrySampleImportServiceIT.java | 67 ++ .../VoyageCatchesOnlySubSampleImportServiceIT.java | 67 ++ ...oyageCatchesOnlyTotalSampleImportServiceIT.java | 67 ++ .../VoyageCommonsAllImportServiceIT.java | 98 +++ .../VoyageCommonsImportServiceITSupport.java | 53 ++ .../VoyageCommonsOnlyTransectImportServiceIT.java | 93 +++ .../VoyageCommonsOnlyTransitImportServiceIT.java | 93 +++ .../VoyageCommonsOnlyVoyageImportServiceIT.java | 82 ++ .../importdata/VoyageOperationImportServiceIT.java | 92 +++ ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 84 ++ ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 81 ++ ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 91 ++ ...lOnlySpeciesAndSizeCategoryImportServiceIT.java | 91 ++ .../VoyageResultsImportServiceITSupport.java | 51 ++ .../VoyageResultsMapFishCellImportServiceIT.java | 77 ++ .../VoyageResultsMapOtherCellImportServiceIT.java | 75 ++ .../VoyageResultsRegionCellImportServiceIT.java | 103 +++ .../VoyageResultsVoyageImportServiceIT.java | 88 ++ ...geResultsVoyageOnlyEchotypeImportServiceIT.java | 68 ++ ...sultsVoyageOnlyLengthAgeKeyImportServiceIT.java | 68 ++ ...tsVoyageOnlyLengthWeightKeyImportServiceIT.java | 68 ++ .../removedata/AbstractRemoveDataServiceTest.java | 112 ++- .../resources/import-data/acoustic/movies.csv.gz | Bin 596169 -> 596169 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 0 -> 6141 bytes .../resources/import-data/catches/subsample.csv.gz | Bin 931 -> 920 bytes .../import-data/catches/subsample_all.csv.gz | Bin 23572 -> 22400 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 705722 -> 632318 bytes .../import-data/echobase-catches.h2.db.gz | Bin 662677 -> 594894 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 178638 -> 183714 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129028 -> 136848 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 0 -> 602363 bytes .../import-data/echobase-operation.h2.db.gz | Bin 324421 -> 328618 bytes .../import-data/result/esdu/byEchotype.csv.gz | Bin 73537 -> 73195 bytes .../esdu/byEchotypeAndSpeciesCategory.csv.gz | Bin 547091 -> 547121 bytes .../esdu/byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2042 bytes .../result/esdu/byEchotype_small.csv.gz | Bin 0 -> 2802 bytes .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141033 -> 141214 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 0 -> 2379 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 707226 -> 709007 bytes .../esdu/bySpeciesAndSizeCategory_small.csv.gz | Bin 0 -> 2544 bytes .../result/region/regionAssociations_small.csv.gz | Bin 0 -> 296 bytes echobase-ui/pom.xml | 15 +- .../echobase/ui/EchoBaseApplicationContext.java | 9 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 5 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 3 +- .../importData/AbstractConfigureImport.java | 4 +- .../actions/importData/AbstractLaunchImport.java | 19 +- .../importData/ConfigureAcousticImport.java | 12 +- .../actions/importData/ConfigureCatchesImport.java | 12 +- .../actions/importData/ConfigureCommonImport.java | 20 +- .../importData/ConfigureOperationImport.java | 12 +- .../actions/importData/ConfigureResultsImport.java | 12 +- .../ui/actions/importData/CreateMission.java | 6 +- .../importData/GetDataProcessingsForVoyage.java | 5 +- .../actions/importData/LaunchAcousticImport.java | 15 +- .../ui/actions/importData/LaunchCatchesImport.java | 15 +- .../ui/actions/importData/LaunchCommonImport.java | 15 +- .../actions/importData/LaunchOperationImport.java | 15 +- .../ui/actions/importData/LaunchResultsImport.java | 16 +- .../echobase/ui/actions/workingDb/Connect.java | 4 +- .../ui/actions/workingDb/CreatePostgresDb.java | 10 +- pom.xml | 34 +- src/site/site_fr.xml | 6 + 336 files changed, 13954 insertions(+), 9267 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.