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 09f06f66e36281e9d469d11f046a846d62a4961a Merge: 1e14261 297e5af Author: Maven Release <maven-release@codelutin.com> Date: Mon Jun 20 12:15:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0-alpha-2' into 'master' echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 14 + .../config/EchoBaseConfigurationOption.java | 46 +- .../entities/references/DataMetadataImpl.java | 2 + .../entities/references/{Gears.java => Ports.java} | 12 +- .../echobase/persistence/EchoBaseDbMeta.java | 5 +- .../MigrationCallBackForVersionSupport.java | 15 +- ...WorkingDbMigrationCallBackForVersion3_905.java} | 20 +- .../i18n/echobase-domain_en_GB.properties | 3 + .../i18n/echobase-domain_fr_FR.properties | 3 + .../migration/workingDb/3.905-1-insert-ports.sql | 4916 ++++++++++++++++++++ .../workingDb/h2/3.905-0-update-model.sql | 115 + .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 27 + .../workingDb/pg/3.905-0-update-model.sql | 115 + .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 27 + echobase-domain/src/main/xmi/echobase.properties | 27 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 90445 -> 98231 bytes echobase-services/pom.xml | 2 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 30 + .../echobase/services/service/DbEditorService.java | 10 +- .../services/service/DecoratorService.java | 12 + .../services/service/UserDbPersistenceService.java | 4 +- .../actions/VoyageAcousticsImportAction.java | 33 +- .../contexts/ImportDataContextSupport.java | 13 +- .../csv/VoyageAcousticImportExportModel.java | 6 +- .../importdata/csv/VoyageAcousticImportRow.java | 43 +- .../VoyageCommonsTransectImportExportModel.java | 4 +- .../csv/VoyageCommonsTransectImportRow.java | 8 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 9 +- .../GearCharacteristicValuesImportModel.java | 60 + .../GearCharacteristicValuesImportRow.java | 68 + .../services/service/importdb/ImportService.java | 76 + .../importdb/strategy/EchoBaseImportStrategy.java | 2 +- .../importdata/AbstractImportDataServiceIT.java | 20 + .../importdata/VoyageAcousticImportServiceIT.java | 12 +- .../removedata/AbstractRemoveDataServiceTest.java | 11 +- .../resources/echobase-importDb-referentiel.zip | Bin 50556 -> 50514 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 6128 -> 6972 bytes .../resources/import-data/common/transect.csv.gz | Bin 21723 -> 21725 bytes .../resources/import-data/common/voyage.csv.gz | Bin 126 -> 117 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 825254 -> 1006673 bytes .../import-data/echobase-catches.h2.db.gz | Bin 755094 -> 936199 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 184645 -> 369833 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 137582 -> 318432 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 601537 -> 785038 bytes .../import-data/echobase-operation.h2.db.gz | Bin 328156 -> 507447 bytes echobase-ui/pom.xml | 3 +- .../echobase/ui/EchoBaseApplicationContext.java | 22 + .../dbeditor/ImportGearCharacteristics.java | 143 + .../src/main/resources/config/struts-dbeditor.xml | 9 + .../src/main/resources/embedded/update-echobase.sh | 54 + .../resources/i18n/echobase-ui_en_GB.properties | 1 + .../resources/i18n/echobase-ui_fr_FR.properties | 1 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 15 + pom.xml | 4 +- src/doc/reunions/reunion_2016-06-16.md | 97 + src/site/en/rst/exportData.rst | 3 + src/site/en/rst/install.rst.vm | 5 + src/site/en/rst/update.rst.vm | 33 +- src/site/rst/exportData.rst | 3 + src/site/rst/install.rst.vm | 20 +- src/site/rst/update.rst.vm | 29 +- 62 files changed, 6084 insertions(+), 130 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.