branch develop updated (d33fd4a -> 1c34736)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from d33fd4a [jgitflow-maven-plugin]updating poms for 4.1-SNAPSHOT development new 235562e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 99a4263 Fix license headers new 1fbab04 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions new bf4bec0 [jgitflow-maven-plugin]merging 'release/4.0' into 'master' new 0df326d [jgitflow-maven-plugin]merging 'master' into 'develop' new 1c34736 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1c3473601efb1fd861cf4b57263203d436c088ee Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:51:23 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0df326d7a961d596f89de13cd8e78a090f17986b Merge: 235562e bf4bec0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:51:22 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 235562ef65dd5cceffd13a6b1019e03d2ba5876e Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:51:21 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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' commit 1fbab04dae95ef83ef467c0107010493f218e5c3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:47:19 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions commit 99a4263a725973d16865d9ecf07c6084baeedf88 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:47:05 2016 +0200 Fix license headers Summary of changes: .../echobase/entities/references/MissionImpl.java | 21 +++++++++++++++++++++ .../service/atlantos/xml/VocabularyExport.java | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 99a4263a725973d16865d9ecf07c6084baeedf88 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:47:05 2016 +0200 Fix license headers --- .../echobase/entities/references/MissionImpl.java | 21 +++++++++++++++++++++ .../service/atlantos/xml/VocabularyExport.java | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java index d9e7b89..4c0cdae 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/MissionImpl.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities.references; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2016 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + public class MissionImpl extends MissionAbstract { private static final long serialVersionUID = 7161911112897999922L; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java index 763c3e8..59b115e 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.atlantos.xml; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2016 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import fr.ifremer.echobase.services.EchoBaseService; import fr.ifremer.echobase.services.service.UserDbPersistenceService; import java.io.IOException; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 1fbab04dae95ef83ef467c0107010493f218e5c3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:47:19 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 4e85f0c..142de8a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 28473a7..d40d466 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index af02dfb..3a87f23 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a32d2be..a032ab0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0-SNAPSHOT</version> + <version>4.0</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 235562ef65dd5cceffd13a6b1019e03d2ba5876e Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:51:21 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 83a4da8..142de8a 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 5aa6fb2..d40d466 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 024b5b7..3a87f23 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 43fc8c7..a032ab0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 0df326d7a961d596f89de13cd8e78a090f17986b Merge: 235562e bf4bec0 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:51:22 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../echobase/entities/references/MissionImpl.java | 21 +++++++++++++++++++++ .../service/atlantos/xml/VocabularyExport.java | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 1c3473601efb1fd861cf4b57263203d436c088ee Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 27 17:51:23 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 142de8a..83a4da8 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index d40d466..5aa6fb2 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 3a87f23..024b5b7 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a032ab0..43fc8c7 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>4.0</version> + <version>4.1-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm