This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 6f26a64 [jgitflow-maven-plugin]merging 'release/4.0-alpha-7' into 'master' adds a175b26 Update docuementation adds ab7c146 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds bd56f3d [jgitflow-maven-plugin]merging 'master' into 'develop' adds 4f7be5d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds fe76025 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop adds 66fc6f0 Fix function for spacial data for mooring adds eaffa46 ref #8007, create double legend for pelagic trawl catch adds c7d4927 ref #8173, create the first basic export for the cruise adds 7478779 ref #8173, continue export models adds 5699c79 ref #8173, continue export models adds 526aa06 ref #8173, create all data structures adds a7f7032 ref #8173, plug export with concatenation adds 828df0a ref #8173, begin export to xml instead of csv adds eddc84e ref #8173, add export biotic adds cdf5d7a Complete acoustic xml export adds 20110c7 Add missing for atlantos export adds c584b14 #8669 Fix conversion for the pagination adds 6b64d24 #8173 Add vocabulary table adds afab4f6 Export biotic export for atlantos adds 85315cc Handle vocabulary in xml adds 1a3f794 Concat files adds f25dc92 Translate adds dcb135a Modify redirection after create mission adds 735993d Put the length to mm adds b1253ac Complete doc for GearCharacteristicValues adds 36198f0 Fix unit tests adds 1d11422 Export altantos on a vessel adds e71351b Fix dependency adds f63aac7 Create UI for atlantos export adds 52303b8 Complete i18n adds de0f765 Complete i18n adds 8d1d613 #8677 Force refresh import file adds 0498112 Add translates adds 791d7a8 Add translates adds 05fb0af Migrate databases for tests adds 4c5074d #8173 Fix SubsamplingFactor adds 99a4263 Fix license headers adds 1fbab04 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions adds bf4bec0 [jgitflow-maven-plugin]merging 'release/4.0' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../ifremer/echobase/entities/data/VoyageImpl.java | 6 +- .../references/MissionImpl.java} | 23 +- .../echobase/persistence/EchoBaseDbMeta.java | 4 +- ...WorkingDbMigrationCallBackForVersion3_910.java} | 12 +- ...WorkingDbMigrationCallBackForVersion3_911.java} | 9 +- .../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 +- .../ExportAtlantosConfiguration.java} | 72 ++-- .../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 +- .../{exportDb => exportAtlantos}/Configure.java | 76 ++-- .../{exportCoser => exportAtlantos}/Download.java | 14 +- .../{exportDb => exportAtlantos}/Export.java | 41 +- .../actions/importData/AbstractLaunchImport.java | 9 +- ...ruts-exportDb.xml => struts-exportAtlantos.xml} | 26 +- .../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 +- .../configure.jsp} | 40 +- .../{exportCoser => exportAtlantos}/progress.jsp | 4 +- .../jsp/{exportCoser => exportAtlantos}/result.jsp | 6 +- .../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, 2148 insertions(+), 289 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/{I18nAble.java => entities/references/MissionImpl.java} (69%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_910.java} (84%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{WorkingDbMigrationCallBackForVersion3_906.java => WorkingDbMigrationCallBackForVersion3_911.java} (88%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.911-0-atlantos.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.910-0-update-procedure.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.911-0-atlantos.sql copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/{exportdb/ExportDbConfiguration.java => atlantos/ExportAtlantosConfiguration.java} (55%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosService.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlWriter.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/atlantos/ExportAtlantosServiceTest.java create mode 100644 echobase-services/src/test/resources/import-data/echobase-atlantos.h2.db.gz copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/{exportDb => exportAtlantos}/Configure.java (51%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/{exportCoser => exportAtlantos}/Download.java (84%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/{exportDb => exportAtlantos}/Export.java (58%) copy echobase-ui/src/main/resources/config/{struts-exportDb.xml => struts-exportAtlantos.xml} (68%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/{importData/configureMooringCommonsImport.jsp => exportAtlantos/configure.jsp} (54%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/{exportCoser => exportAtlantos}/progress.jsp (91%) copy echobase-ui/src/main/webapp/WEB-INF/jsp/{exportCoser => exportAtlantos}/result.jsp (86%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.