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 a596d2df575d8b01fd0f1e86d34e25cfb691815c Merge: 72765ae 8ec8f24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 13:47:49 2016 +0200 Livrable #8171 Merge branch 'feature/#8171' into develop .../echobase/entities/references/Ports.java | 39 + .../echobase/persistence/EchoBaseDbMeta.java | 5 +- .../MigrationCallBackForVersionSupport.java | 15 +- .../WorkingDbMigrationCallBackForVersion3_902.java | 54 - .../WorkingDbMigrationCallBackForVersion3_905.java | 38 + .../migration/workingDb/3.905-1-insert-ports.sql | 4903 ++++++++++++++++++++ .../workingDb/h2/3.905-0-update-model.sql | 95 + .../workingDb/pg/3.905-0-update-model.sql | 95 + echobase-domain/src/main/xmi/echobase.properties | 27 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 90472 -> 98244 bytes .../echobase/services/csv/EchoBaseCsvUtil.java | 12 + .../services/service/DecoratorService.java | 12 + .../services/service/UserDbPersistenceService.java | 4 +- .../contexts/ImportDataContextSupport.java | 10 + .../VoyageCommonsTransectImportExportModel.java | 4 +- .../csv/VoyageCommonsTransectImportRow.java | 8 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 9 +- .../importdb/strategy/EchoBaseImportStrategy.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 11 +- .../resources/echobase-importDb-referentiel.zip | Bin 50556 -> 50514 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 pom.xml | 5 +- 29 files changed, 5263 insertions(+), 85 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.