This is an automated email from the git hooks/post-receive script. New commit to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 4436d41e3a941178355955185f20e616f2727b80 Merge: 242f86d5 8f07a2a4 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Feb 27 11:09:38 2020 +0100 Merge branch 'release/4.2-rc1' .gitlab-ci.yml | 39 +++ echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 7 +- .../echobase/entities/data/EchotypeTopiaDao.java | 2 +- .../echobase/entities/data/TransitImpl.java | 21 +- .../ifremer/echobase/entities/data/VoyageImpl.java | 11 +- .../entities/references/SampleDataTypeImpl.java | 4 - .../WorkingDbMigrationCallBackForVersion3_914.java | 47 +++ .../WorkingDbMigrationCallBackForVersion3_915.java | 48 +++ .../WorkingDbMigrationCallBackForVersion3_916.java | 47 +++ .../workingDb/3.914-1-importlog-importtext.sql | 21 ++ .../workingDb/h2/3.914-1-importlog-importtext.sql | 21 ++ .../h2/3.915-0-dataAcquisition-dataProcessing.sql | 27 ++ .../migration/workingDb/h2/3.915-1-echotypeId.sql | 21 ++ .../workingDb/h2/3.916-0-gear-icesExport.sql | 22 ++ .../workingDb/pg/3.914-1-importlog-importtext.sql | 21 ++ .../pg/3.915-0-dataAcquisition-dataProcessing.sql | 26 ++ .../migration/workingDb/pg/3.915-1-echotypeId.sql | 21 ++ echobase-domain/src/main/xmi/echobase.properties | 3 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 100538 -> 100762 bytes echobase-services/pom.xml | 8 +- .../echobase/services/csv/CellValueParser.java | 5 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 3 +- .../echobase/services/service/DbEditorService.java | 8 + .../services/service/UserDbPersistenceService.java | 52 +++- .../service/atlantos/ExportAtlantosService.java | 25 +- .../service/atlantos/xml/VocabularyExport.java | 128 ++++++-- .../service/atlantos/xml/XmlAccousticExport.java | 76 ++--- .../service/atlantos/xml/XmlBioticExport.java | 338 ++++++++++----------- .../service/importdata/ImportDataService.java | 39 +-- .../actions/ImportAcousticsActionSupport.java | 37 ++- .../actions/ImportCalibrationActionSupport.java | 44 +++ .../ImportResultsEchotypeActionSupport.java | 5 +- .../VoyageAcousticsCalibrationImportAction.java | 113 +++++++ .../actions/VoyageAcousticsImportAction.java | 2 + .../VoyageCatchesSubSampleImportAction.java | 34 +-- .../VoyageOperationsOperationImportAction.java | 2 +- .../VoyageResultsMapFishCellImportAction.java | 4 +- .../VoyageResultsMapOtherCellImportAction.java | 3 +- .../ImportAcousticsConfiguration.java | 9 +- .../contexts/VoyageCatchesImportDataContext.java | 16 - .../importdata/csv/AcousticImportExportModel.java | 8 +- .../service/importdata/csv/AcousticImportRow.java | 28 +- .../csv/CalibrationImportExportModel.java | 75 +++++ .../importdata/csv/CalibrationImportRow.java | 125 ++++++++ .../importdata/csv/ResultsEchotypeImportRow.java | 9 + .../VoyageCatchesSubSampleImportExportModel.java | 5 +- .../csv/VoyageCatchesSubSampleImportRow.java | 11 - ...yageResultsVoyageEchotypeImportExportModel.java | 2 + .../strategy/AcousticRemoveDataStrategy.java | 10 + .../services/service/spatial/LizmapRepository.java | 28 +- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../echobase/services/EchoBaseServiceFixtures.java | 8 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 283 ----------------- .../atlantos/ExportAtlantosServiceTest.java | 40 ++- .../VoyageAcousticCalibrationImportServiceIT.java | 121 ++++++++ .../VoyageCatchesOnlySubSampleImportServiceIT.java | 6 +- .../importdata/VoyageOperationImportServiceIT.java | 6 +- .../VoyageResultsMapFishCellImportServiceIT.java | 11 +- .../service/importdb/ImportDbServiceTest.java | 3 +- .../resources/echobase-importDb-referentiel.zip | Bin 51131 -> 50749 bytes .../import-data/acoustic/calibrations_small.csv.gz | Bin 0 -> 231 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 7963 -> 7976 bytes .../import-data/catches/biometrysample.csv.gz | Bin 321 -> 314 bytes .../resources/import-data/catches/subsample.csv.gz | Bin 920 -> 864 bytes .../import-data/catches/subsample_all.csv.gz | Bin 22400 -> 21528 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 373494 -> 388742 bytes .../import-data/operation/gearmetadatavalue.csv.gz | Bin 4964 -> 3302 bytes .../import-data/operation/operation.csv.gz | Bin 6056 -> 3508 bytes .../operation/operationmetadatavalue.csv.gz | Bin 2529 -> 1519 bytes .../import-data/result/voyage/echotype.csv.gz | Bin 617 -> 616 bytes echobase-ui/pom.xml | 2 +- .../echobase/ui/EchoBaseApplicationContext.java | 14 +- .../echobase/ui/EchoBaseStaticContentLoader.java | 3 +- .../importData/ConfigureAcousticImport.java | 12 + .../echobase/ui/validators/LoginValidator.java | 4 + .../resources/i18n/echobase-ui_en_GB.properties | 30 +- .../resources/i18n/echobase-ui_fr_FR.properties | 46 +-- .../src/main/webapp/WEB-INF/includes/footer.jsp | 9 +- .../jsp/importData/configureAcousticImport.jsp | 3 + pom.xml | 93 +++--- src/site/en/rst/exportAtlantos.rst | 42 +++ src/site/en/rst/importData.rst | 42 +-- src/site/rst/exportAtlantos.rst | 42 +++ src/site/rst/exportData.rst | 17 ++ src/site/rst/importData.rst | 42 +-- 87 files changed, 1657 insertions(+), 887 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.