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 1e14261aa0f9d49e704b49dbfa6565f5401d6653 Merge: 21f7034 fae7167 Author: Maven Release <maven-release@codelutin.com> Date: Fri May 13 09:11:24 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-1' into 'master' echobase-domain/pom.xml | 68 +- .../fr/ifremer/echobase/EchoBaseDateConverter.java | 5 +- .../echobase/config/EchoBaseConfiguration.java | 46 +- .../config/EchoBaseConfigurationOption.java | 6 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 175 ---- .../echobase/entities/AbstractEchoBaseDao.java | 5 +- .../fr/ifremer/echobase/entities/DriverType.java | 29 +- .../EchoBaseInternalTopiaApplicationContext.java | 93 ++ .../EchoBaseUserTopiaApplicationContext.java | 98 +- .../echobase/entities/EchoBaseUserTopiaDao.java | 6 +- .../EchoBaseUserTopiaPersistenceContext.java | 12 +- .../echobase/entities/ExportQueryTopiaDao.java | 6 +- ...hoBaseUserTopiaDao.java => FixedH2Dialect.java} | 35 +- .../echobase/entities/ImportFileIdTopiaDao.java | 98 ++ .../echobase/entities/ImportFileTopiaDao.java | 47 + ...aseUserTopiaDao.java => ImportLogTopiaDao.java} | 30 +- .../fr/ifremer/echobase/entities/ImportedCell.java | 62 ++ .../echobase/entities/ImportedCellResult.java | 62 ++ .../entities/ImportedSampleDataResult.java | 69 ++ .../echobase/entities/data/CategoryTopiaDao.java | 6 +- .../ifremer/echobase/entities/data/CellImpl.java | 12 +- .../echobase/entities/data/CellTopiaDao.java | 21 +- .../fr/ifremer/echobase/entities/data/Cells.java | 12 +- .../SampleTypeImpl.java => data/DataImpl.java} | 26 +- .../fr/ifremer/echobase/entities/data/Datas.java | 62 ++ .../echobase/entities/data/EchotypeTopiaDao.java | 1 - .../GearMetadataValueImpl.java} | 24 +- .../echobase/entities/data/OperationImpl.java | 22 +- .../OperationMetadataValueImpl.java} | 25 +- .../SampleDataImpl.java} | 26 +- .../Gears.java => data/SampleDatas.java} | 20 +- .../SampleTypeImpl.java => data/SampleImpl.java} | 26 +- .../echobase/entities/references/CellTypeImpl.java | 15 +- .../echobase/entities/references/CellTypes.java | 15 +- .../entities/references/DataMetadataImpl.java | 13 +- .../{SampleTypeImpl.java => GearImpl.java} | 23 +- .../echobase/entities/references/Gears.java | 5 +- .../entities/references/SampleDataTypeImpl.java | 19 +- .../entities/references/SampleTypeImpl.java | 10 + .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 85 +- .../java/fr/ifremer/echobase/io/InputFile.java | 20 + .../echobase/persistence/EchoBaseDbMeta.java | 5 + .../echobase/persistence/EchoBaseEntityHelper.java | 120 +-- .../persistence/EchoBasePersistenceHelper.java | 18 +- .../EchobaseTopiaApplicationContexts.java | 226 ----- .../echobase/persistence/JdbcConfiguration.java | 23 +- .../EchoBaseMigrationCallBackResolver.java | 50 +- .../MigrationCallBackForVersionSupport.java | 96 ++ ...rVersion.java => MigrationCallbackSupport.java} | 26 +- ... InternalDbMigrationCallBackForVersion2_2.java} | 41 +- ...ernalDbMigrationCallBackForVersionSupport.java} | 26 +- .../internalDb/InternalDbMigrationCallback.java} | 26 +- .../migration/internalDb/MigrationCallback.java | 54 -- .../workingDb/MigrationCallBackForVersion.java | 74 -- ...> WorkingDbMigrationCallBackForVersion2_2.java} | 37 +- ...WorkingDbMigrationCallBackForVersion2_5_1.java} | 17 +- ...> WorkingDbMigrationCallBackForVersion2_6.java} | 43 +- ...WorkingDbMigrationCallBackForVersion2_6_1.java} | 22 +- ...WorkingDbMigrationCallBackForVersion2_7_2.java} | 29 +- ...WorkingDbMigrationCallBackForVersion3_900.java} | 27 +- ...WorkingDbMigrationCallBackForVersion3_901.java} | 31 +- ...WorkingDbMigrationCallBackForVersion3_902.java} | 34 +- ...WorkingDbMigrationCallBackForVersion3_903.java} | 30 +- ...rkingDbMigrationCallBackForVersionSupport.java} | 46 +- .../WorkingDbMigrationCallbackForH2.java} | 24 +- .../WorkingDbMigrationCallbackForPostgresql.java | 21 +- ...igration.internalDb.MigrationCallBackForVersion | 1 - ...migration.workingDb.MigrationCallBackForVersion | 5 - .../main/resources/echobase-internaldb.properties | 44 - .../main/resources/echobase-workingdb.properties | 44 - .../i18n/echobase-domain_en_GB.properties | 1 + .../i18n/echobase-domain_fr_FR.properties | 1 + .../workingDb/3.901-0-clean-importLog-table.sql | 22 + .../3.902-0-add-SpeciesCategory_lengthClass.sql | 21 + .../migration/workingDb/h2/3.900-0-fix-types.sql | 76 ++ .../h2/3.901-1-upgrade-importFile-table.sql | 30 + .../workingDb/h2/3.903-0-add-naturalIds.sql | 22 + .../{ => 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 | 76 ++ .../pg/3.901-1-upgrade-importFile-table.sql | 30 + .../workingDb/pg/3.903-0-add-naturalIds.sql | 22 + .../src/main/xmi/echobase-internal.properties | 11 +- echobase-domain/src/main/xmi/echobase.properties | 30 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89705 -> 90445 bytes .../echobase/persistence/EchoBaseDbMetaTest.java | 2 +- echobase-services/pom.xml | 4 +- .../services/DefaultEchoBaseServiceContext.java | 3 +- .../echobase/services/EchoBaseServiceSupport.java | 2 +- .../echobase/services/csv/BatchCsvExport.java | 121 +++ .../CellAble.java} | 24 +- .../echobase/services/csv/CellValueFormatter.java | 115 +++ .../echobase/services}/csv/CellValueParser.java | 29 +- .../echobase/services}/csv/ChainValueParser.java | 13 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 347 +++++++ .../ResultAble.java} | 25 +- .../services/csv/ResultValueFormatter.java | 33 +- .../ResultValueGetter.java} | 37 +- .../echobase/services}/csv/ResultValueParser.java | 9 +- .../ResultValueSetter.java} | 19 +- .../ValueFormatterByFunction.java} | 24 +- .../echobase/services/service/CoserApiService.java | 3 +- .../echobase/services/service/DbEditorService.java | 40 +- .../services/service/DecoratorService.java | 3 +- .../services/service/UserDbPersistenceService.java | 583 ++++++++---- .../echobase/services/service/UserService.java | 33 +- .../EmbeddedApplicationService.java | 9 +- .../service/exportCoser/ExportCoserService.java | 3 +- .../service/exportCoser/IndicatorExportModel.java | 2 +- .../exportCoser/RawDataCatchExportModel.java | 2 +- .../exportCoser/RawDataSizeExportModel.java | 4 +- .../exportCoser/RawDataStrataExportModel.java | 2 +- .../service/exportCoser/SpeciesExportModel.java | 2 +- .../services/service/exportdb/ExportDbService.java | 41 +- .../services/service/exportdb/ExportService.java | 19 +- .../service/exportquery/ExportQueryCsvModel.java | 2 +- .../service/exportquery/ExportQueryService.java | 24 +- .../service/exportquery/GenericSQLQuery.java | 10 +- .../importdata/AbstractImportDataService.java | 456 ---------- .../service/importdata/AcousticImportResult.java | 57 -- .../service/importdata/AcousticImportService.java | 778 ---------------- .../service/importdata/AgeCategoryCache.java | 74 ++ .../service/importdata/CatchesImportService.java | 535 ----------- ...mportException.java => CheckFileException.java} | 39 +- .../service/importdata/CommonAllImportService.java | 67 -- .../importdata/CommonTransectImportService.java | 158 ---- .../importdata/CommonTransitImportService.java | 123 --- .../importdata/CommonVoyageImportService.java | 133 --- ...ion.java => DataMetadataNotFoundException.java} | 13 +- ...=> DuplicatedEchotypeAssociationException.java} | 20 +- ...java => DuplicatedElementaryCellException.java} | 14 +- ...ption.java => DuplicatedEsduCellException.java} | 14 +- ...a => DuplicatedGearMetadataValueException.java} | 33 +- ...eption.java => DuplicatedMapCellException.java} | 14 +- ...tion.java => DuplicatedOperationException.java} | 16 +- ...DuplicatedOperationMetadataValueException.java} | 26 +- ...ion.java => DuplicatedRegionCellException.java} | 14 +- ...licatedResultsVoyageLengthAgeKeyException.java} | 20 +- ...atedResultsVoyageLengthWeightKeyException.java} | 20 +- ...ception.java => DuplicatedSampleException.java} | 16 +- ...tion.java => DuplicatedSubSampleException.java} | 30 +- ...ption.java => DuplicatedTransectException.java} | 16 +- ...eption.java => DuplicatedTransitException.java} | 17 +- ...ception.java => DuplicatedVoyageException.java} | 16 +- .../importdata/EchoBaseCsvFileImportResult.java | 60 -- ...=> ElementaryCellWithoutDepthEndException.java} | 13 +- ...ception.java => EsduCellNotFoundException.java} | 15 +- ...va => EsduCellWithDepthEndFilledException.java} | 13 +- .../service/importdata/ImportDataFileResult.java | 185 ++++ .../service/importdata/ImportDataResult.java | 66 ++ .../service/importdata/ImportDataService.java | 403 +++++++++ .../service/importdata/ImportException.java | 30 +- ...va => MismatchAgeCategoryMeaningException.java} | 19 +- ...a => MismatchSizeCategoryMeaningException.java} | 19 +- ...Exception.java => MismatchVoyageException.java} | 23 +- ...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 | 116 +++ .../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 | 74 ++ .../service/importdata/SpeciesCategoryCache.java | 105 +++ ...ception.java => TransectNotFoundException.java} | 15 +- ...xception.java => TransitNotFoundException.java} | 14 +- .../actions/ImportDataActionSupport.java | 494 ++++++++++ .../actions/VoyageAcousticsImportAction.java | 903 +++++++++++++++++++ .../VoyageAcousticsImportDataActionSupport.java} | 31 +- .../VoyageCatchesBiometrySampleImportAction.java | 170 ++++ .../VoyageCatchesImportDataActionSupport.java | 82 ++ .../VoyageCatchesSubSampleImportAction.java | 318 +++++++ .../VoyageCatchesTotalSampleImportAction.java | 230 +++++ .../VoyageCommonsImportDataActionSupport.java} | 26 +- .../actions/VoyageCommonsTransectImportAction.java | 143 +++ .../actions/VoyageCommonsTransitImportAction.java | 124 +++ .../actions/VoyageCommonsVoyageImportAction.java | 148 +++ .../VoyageOperationsGearMetadataImportAction.java | 130 +++ .../VoyageOperationsImportDataActionSupport.java} | 31 +- .../VoyageOperationsOperationImportAction.java | 131 +++ ...ageOperationsOperationMetadataImportAction.java | 117 +++ .../VoyageResultsCellImportDataActionSupport.java | 150 ++++ ...ndSpeciesCategoryAndLengthCellImportAction.java | 93 ++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 73 ++ ...oyageResultsEsduByEchotypeCellImportAction.java | 68 ++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 80 ++ .../VoyageResultsImportDataActionSupport.java | 90 ++ .../VoyageResultsMapFishCellImportAction.java | 266 ++++++ .../VoyageResultsMapOtherCellImportAction.java | 233 +++++ ...VoyageResultsRegionAssociationImportAction.java | 121 +++ .../actions/VoyageResultsRegionImportAction.java | 186 ++++ .../VoyageResultsRegionResultsImportAction.java | 211 +++++ .../VoyageResultsVoyageEchotypeImportAction.java | 174 ++++ ...oyageResultsVoyageLengthAgeKeyImportAction.java | 142 +++ ...geResultsVoyageLengthWeightKeyImportAction.java | 152 ++++ .../ImportDataConfigurationSupport.java} | 33 +- .../VoyageAcousticsImportConfiguration.java} | 31 +- .../VoyageCatchesImportConfiguration.java} | 21 +- .../VoyageCommonsImportConfiguration.java} | 38 +- .../VoyageImportDataConfigurationSupport.java | 22 +- .../VoyageOperationsImportConfiguration.java} | 19 +- .../VoyageResultsImportConfiguration.java} | 101 +-- .../contexts/ImportDataContextSupport.java | 291 ++++++ .../VoyageAcousticsImportDataContext.java} | 32 +- .../contexts/VoyageCatchesImportDataContext.java | 151 ++++ .../VoyageCommonsImportDataContext.java} | 34 +- .../contexts/VoyageImportDataContextSupport.java | 142 +++ .../VoyageOperationsImportDataContext.java | 42 + .../contexts/VoyageResultsImportDataContext.java | 235 +++++ .../importdata/csv/AcousticImportModel.java | 136 --- .../importdata/csv/BiometrySampleImportModel.java | 60 -- .../csv/EchoBaseImportExportModelSupport.java | 72 ++ .../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 | 126 --- .../importdata/csv/OperationImportModel.java | 65 -- .../csv/OperationMetadataValueImportModel.java | 57 -- .../csv/RegionCellAssociationImportModel.java | 53 -- .../importdata/csv/RegionCellImportModel.java | 59 -- .../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} | 99 +- ...yageCatchesBiometrySampleImportExportModel.java | 71 ++ ...a => VoyageCatchesBiometrySampleImportRow.java} | 43 +- .../VoyageCatchesSubSampleImportExportModel.java | 84 ++ ...w.java => VoyageCatchesSubSampleImportRow.java} | 52 +- .../VoyageCatchesTotalSampleImportExportModel.java | 78 ++ ...java => VoyageCatchesTotalSampleImportRow.java} | 40 +- .../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} | 37 +- ...VoyageOperationsOperationImportExportModel.java | 84 ++ ...ava => VoyageOperationsOperationImportRow.java} | 68 +- ...onsOperationMetadataValueImportExportModel.java | 68 ++ ...OperationsOperationMetadataValueImportRow.java} | 41 +- ...dSpeciesCategoryAndLengthImportExportModel.java | 100 +++ ...otypeAndSpeciesCategoryAndLengthImportRow.java} | 94 +- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 ++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 73 +- ...yageResultsEsduByEchotypeImportExportModel.java | 83 ++ ...a => VoyageResultsEsduByEchotypeImportRow.java} | 53 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 91 ++ ...sultsEsduBySpeciesAndAgeCategoryImportRow.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} | 57 +- ...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/EchoBaseImportModelFactory.java | 10 +- .../importdb/strategy/EchoBaseImportStrategy.java | 3 +- .../importdb/strategy/FreeImportDbStrategy.java | 13 +- .../service/removedata/RemoveDataService.java | 28 +- .../strategy/AbstractRemoveDataStrategy.java | 43 +- .../strategy/AcousticRemoveDataStrategy.java | 13 +- .../strategy/CatchesRemoveDataStrategy.java | 6 +- .../strategy/CommonAllRemoveDataStrategy.java | 23 +- .../strategy/CommonTransectRemoveDataStrategy.java | 17 +- .../strategy/CommonTransitRemoveDataStrategy.java | 19 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 23 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 23 +- .../strategy/OperationRemoveDataStrategy.java | 31 +- .../strategy/ResultEsduRemoveDataStrategy.java | 6 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 6 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 6 +- .../strategy/ResultRegionRemoveDataStrategy.java | 6 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 11 +- .../services/service/spatial/GisService.java | 3 +- .../services/service/spatial/LizmapRepository.java | 6 +- .../workingDb/WorkingDbConfigurationService.java | 9 +- .../i18n/echobase-services_en_GB.properties | 24 +- .../i18n/echobase-services_fr_FR.properties | 22 +- .../echobase/services/EchoBaseServiceFixtures.java | 40 +- .../services/EchoBaseTestServiceSupport.java | 169 +--- .../services/FakeEchoBaseServiceContext.java | 81 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 23 +- .../echobase/services/ImportDataFixtures.java | 153 ++++ .../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 | 102 +++ .../VoyageCatchesImportServiceITSupport.java | 79 ++ ...geCatchesOnlyBiometrySampleImportServiceIT.java | 75 ++ .../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 ++ ...AndSpeciesCategoryAndLengthImportServiceIT.java | 87 ++ ...ciesCategoryAndLength_SmallImportServiceIT.java | 85 ++ ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 84 ++ ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 81 ++ ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 91 ++ .../VoyageResultsImportServiceITSupport.java | 51 ++ .../VoyageResultsMapFishCellImportServiceIT.java | 77 ++ .../VoyageResultsMapOtherCellImportServiceIT.java | 75 ++ .../VoyageResultsRegionCellImportServiceIT.java | 108 +++ ...VoyageResultsRegionCell_AllImportServiceIT.java | 108 +++ .../VoyageResultsVoyageImportServiceIT.java | 88 ++ ...geResultsVoyageOnlyEchotypeImportServiceIT.java | 68 ++ ...sultsVoyageOnlyLengthAgeKeyImportServiceIT.java | 68 ++ ...tsVoyageOnlyLengthWeightKeyImportServiceIT.java | 68 ++ .../removedata/AbstractRemoveDataServiceTest.java | 118 ++- .../resources/echobase-importDb-referentiel.zip | Bin 50920 -> 50556 bytes .../resources/import-data/acoustic/movies.csv.gz | Bin 596169 -> 596169 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 0 -> 6128 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 -> 825254 bytes .../import-data/echobase-catches.h2.db.gz | Bin 662677 -> 755094 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 178638 -> 184645 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129028 -> 137582 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 0 -> 601537 bytes .../import-data/echobase-operation.h2.db.gz | Bin 324421 -> 328156 bytes .../import-data/result/esdu/byEchotype.csv.gz | Bin 73537 -> 73195 bytes .../esdu/byEchotypeAndSpeciesCategory.csv.gz | Bin 547091 -> 547121 bytes .../byEchotypeAndSpeciesCategoryAndLength.csv.gz | Bin 0 -> 709794 bytes ...chotypeAndSpeciesCategoryAndLength_small.csv.gz | Bin 0 -> 2585 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 -> 0 bytes .../result/region/regionAssociations_small.csv.gz | Bin 0 -> 296 bytes echobase-ui/pom.xml | 17 +- 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 +- .../echobase/ui/EchoBaseApplicationContext.java | 23 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 17 +- .../echobase/ui/actions/EchoBaseActionSupport.java | 9 +- .../echobase/ui/actions/dbeditor/ExportTable.java | 2 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 3 +- .../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 +- .../importData/AbstractConfigureImport.java | 4 +- .../actions/importData/AbstractLaunchImport.java | 19 +- .../importData/ConfigureAcousticImport.java | 12 +- .../actions/importData/ConfigureCatchesImport.java | 12 +- .../actions/importData/ConfigureCommonImport.java | 22 +- .../importData/ConfigureOperationImport.java | 12 +- .../actions/importData/ConfigureResultsImport.java | 24 +- .../ui/actions/importData/CreateMission.java | 6 +- .../ui/actions/importData/DownloadInputFile.java | 94 ++ .../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 +- .../ifremer/echobase/ui/actions/user/GetUsers.java | 2 +- .../echobase/ui/actions/workingDb/Connect.java | 4 +- .../ui/actions/workingDb/CreatePostgresDb.java | 10 +- .../ui/actions/workingDb/DownloadExportFile.java | 27 +- ...oadImportFile.java => DownloadFileSupport.java} | 24 +- .../ui/actions/workingDb/DownloadImportFile.java | 80 +- .../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 +- .../main/resources/config/struts-importData.xml | 11 + .../src/main/resources/config/struts-workingDb.xml | 11 + .../resources/i18n/echobase-ui_en_GB.properties | 7 +- .../resources/i18n/echobase-ui_fr_FR.properties | 7 +- .../jsp/importData/configureResultsImport.jsp | 4 +- .../jsp/importData/importDataActionResult.jsp | 62 ++ .../jsp/importData/resultAcousticImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCommonImport.jsp | 2 +- .../jsp/importData/resultOperationImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 70 +- pom.xml | 75 +- src/doc/reunions/reunion_2016-03-24.txt | 122 +++ src/doc/reunions/reunion_2016-04-05.md | 124 +++ src/site/en/rst/configure.rst.vm | 81 ++ src/site/en/rst/embedded.rst | 5 + src/site/en/rst/exportData.rst | 5 + src/site/{ => en}/rst/gis.rst | 3 - src/site/en/rst/importData.rst | 797 ++++++++-------- src/site/en/rst/install.rst.vm | 1 + src/site/en/rst/model.rst | 4 +- src/site/en/rst/removeData.rst | 2 +- src/site/en/rst/update.rst.vm | 59 ++ src/site/en/rst/usage.rst.vm | 2 - src/site/rst/gis.rst | 3 - src/site/rst/importData.rst | 997 +++++++++++---------- src/site/rst/install.rst.vm | 3 - src/site/rst/model.rst | 4 +- src/site/rst/removeData.rst | 2 +- src/site/rst/usage.rst.vm | 2 - src/site/site_en.xml | 5 +- src/site/site_fr.xml | 6 + 447 files changed, 18044 insertions(+), 11491 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.