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 bf4bec08c17d8f9c25cc838ccd224750733cdb10 Merge: 6f26a64 1fbab04 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:51:12 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.0' into 'master' echobase-domain/pom.xml | 2 +- .../ifremer/echobase/entities/data/VoyageImpl.java | 6 +- .../echobase/entities/references/MissionImpl.java | 33 ++ .../echobase/persistence/EchoBaseDbMeta.java | 4 +- .../WorkingDbMigrationCallBackForVersion3_910.java | 56 +++ .../WorkingDbMigrationCallBackForVersion3_911.java | 53 +++ .../workingDb/h2/3.905-0-update-model.sql | 4 - .../workingDb/h2/3.905-2-migrate-voyage-ports.sql | 3 - .../migration/workingDb/h2/3.911-0-atlantos.sql | 57 +++ .../workingDb/pg/3.905-0-update-model.sql | 4 - .../workingDb/pg/3.905-2-migrate-voyage-ports.sql | 3 - .../workingDb/pg/3.910-0-update-procedure.sql | 187 ++++++++++ .../migration/workingDb/pg/3.911-0-atlantos.sql | 57 +++ .../src/main/resources/postgis-structure.sql | 8 +- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 99798 -> 100339 bytes echobase-services/pom.xml | 2 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 4 + .../services/service/DecoratorService.java | 4 + .../services/service/UserDbPersistenceService.java | 33 +- .../echobase/services/service/UserService.java | 2 +- .../atlantos/ExportAtlantosConfiguration.java | 104 ++++++ .../service/atlantos/ExportAtlantosService.java | 157 ++++++++ .../service/atlantos/xml/VocabularyExport.java | 144 ++++++++ .../service/atlantos/xml/XmlAccousticExport.java | 411 +++++++++++++++++++++ .../service/atlantos/xml/XmlBioticExport.java | 388 +++++++++++++++++++ .../services/service/atlantos/xml/XmlWriter.java | 98 +++++ .../actions/ImportAcousticsActionSupport.java | 8 +- .../actions/ImportDataActionSupport.java | 2 +- .../ImportAcousticsConfiguration.java | 30 ++ .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 2 +- .../gis/templates/EchoBaseQGisTemplate.qgs | 159 ++++++-- .../echobase/services/ImportDataFixtures.java | 11 + .../services/MigrateImportDataDatabasesIT.java | 6 + .../atlantos/ExportAtlantosServiceTest.java | 63 ++++ .../resources/echobase-importDb-referentiel.zip | Bin 50514 -> 51131 bytes .../import-data/echobase-atlantos.h2.db.gz | Bin 0 -> 1234109 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 991130 -> 998860 bytes .../import-data/echobase-catches.h2.db.gz | Bin 924955 -> 932467 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 370149 -> 373494 bytes .../import-data/echobase-mooring-results.h2.db.gz | Bin 930474 -> 937442 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 925371 -> 932719 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318631 -> 326412 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 785190 -> 793954 bytes .../import-data/echobase-operation.h2.db.gz | Bin 508067 -> 515535 bytes echobase-ui/pom.xml | 2 +- .../ui/actions/exportAtlantos/Configure.java | 88 +++++ .../ui/actions/exportAtlantos/Download.java | 96 +++++ .../echobase/ui/actions/exportAtlantos/Export.java | 84 +++++ .../actions/importData/AbstractLaunchImport.java | 9 +- .../resources/config/struts-exportAtlantos.xml | 77 ++++ .../main/resources/config/struts-importData.xml | 2 +- .../resources/i18n/echobase-ui_en_GB.properties | 18 +- .../resources/i18n/echobase-ui_fr_FR.properties | 22 +- echobase-ui/src/main/resources/struts.xml | 1 + echobase-ui/src/main/webapp/WEB-INF/decorators.xml | 1 + .../src/main/webapp/WEB-INF/includes/header.jsp | 9 +- .../WEB-INF/jsp/exportAtlantos/configure.jsp | 64 ++++ .../webapp/WEB-INF/jsp/exportAtlantos/progress.jsp | 34 ++ .../webapp/WEB-INF/jsp/exportAtlantos/result.jsp | 47 +++ .../jsp/importData/configureAcousticImport.jsp | 12 + .../importData/configureMooringAcousticImport.jsp | 12 + .../WEB-INF/jsp/importData/createMission.jsp | 3 + pom.xml | 2 +- src/site/en/rst/importData.rst | 86 +++-- src/site/rst/importData.rst | 74 +++- 66 files changed, 2739 insertions(+), 111 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.