branch develop updated (a05ae57 -> 27cd9cd)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from a05ae57 [jgitflow-maven-plugin]updating poms for 2.8-SNAPSHOT development new 66febc8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d79458 [jgitflow-maven-plugin]updating poms for branch '2.7.1' with snapshot versions new 2ba1d6e add license headers new 4a8fd88 [jgitflow-maven-plugin]updating poms for branch'release/2.7.1' with non-snapshot versions new 2e1d397 Merge branch 'release/2.7.1' new dd25b7d Merge branch 'master' into develop new 27cd9cd [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 27cd9cdb9bf85756cf569ae90445b52169cded99 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:49 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit dd25b7db0f79490f4b51811df1342303b48beaad Merge: 66febc8 2e1d397 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:48 2014 +0000 Merge branch 'master' into develop commit 66febc822420ba635860203079dfa0432170e838 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:48 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 2e1d397312a423df3cb2cebe8e4b3ec36b737cce Merge: 649ef30 4a8fd88 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:40 2014 +0000 Merge branch 'release/2.7.1' commit 4a8fd8817ffa56066b40bfbd7d6bd2d992ed012f Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:36:20 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.7.1' with non-snapshot versions commit 2ba1d6eb8e6b3f7deb8d140d592779093016d7ae Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:36:08 2014 +0000 add license headers Summary of changes: .../EchoBaseUserTopiaApplicationContext.java | 21 +++++++++++++++++++++ .../services/service/spatial/GisService.java | 21 +++++++++++++++++++++ .../services/service/spatial/GisServiceTest.java | 21 +++++++++++++++++++++ 3 files changed, 63 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 http://git.codelutin.com/echobase.git commit 2ba1d6eb8e6b3f7deb8d140d592779093016d7ae Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:36:08 2014 +0000 add license headers --- .../EchoBaseUserTopiaApplicationContext.java | 21 +++++++++++++++++++++ .../services/service/spatial/GisService.java | 21 +++++++++++++++++++++ .../services/service/spatial/GisServiceTest.java | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java index d4b65fe..063a282 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.entities; +/* + * #%L + * EchoBase :: Domain + * %% + * Copyright (C) 2011 - 2014 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 org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Environment; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java index 833824f..c443147 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.spatial; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 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 com.google.common.base.Charsets; import com.google.common.base.Preconditions; import fr.ifremer.echobase.EchoBaseTechnicalException; diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/GisServiceTest.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/GisServiceTest.java index b3f1a3e..eca3206 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/GisServiceTest.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/GisServiceTest.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.spatial; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2014 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.entities.DriverType; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.data.VoyageImpl; -- 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 http://git.codelutin.com/echobase.git commit 4a8fd8817ffa56066b40bfbd7d6bd2d992ed012f Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:36:20 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.7.1' 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 c4376aa..9457b85 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 99efd18..64cbd7d 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 8f84db9..d6fa5d1 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index be19b04..5693986 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1-SNAPSHOT</version> + <version>2.7.1</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 http://git.codelutin.com/echobase.git commit 2e1d397312a423df3cb2cebe8e4b3ec36b737cce Merge: 649ef30 4a8fd88 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:40 2014 +0000 Merge branch 'release/2.7.1' echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 21 +- .../config/EchoBaseConfigurationOption.java | 4 +- .../entities/EchoBaseUserPersistenceContext.java | 19 +- .../EchoBaseUserTopiaApplicationContext.java | 148 ++ .../EchoBaseUserTopiaPersistenceContext.java | 48 +- .../fr/ifremer/echobase/io/CommandLineUtils.java | 9 +- .../workingDb/MigrationCallBackForVersion2_2.java | 2 +- .../MigrationCallBackForVersion2_5_1.java | 2 +- .../workingDb/MigrationCallBackForVersion2_6.java | 2 +- .../MigrationCallBackForVersion2_6_1.java | 2 +- echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 15 +- .../importdata/AbstractImportDataService.java | 6 +- .../service/importdata/AcousticImportService.java | 35 +- .../services/service/importdb/ImportDbService.java | 14 +- .../{SpatialService.java => GisService.java} | 200 +-- .../service/spatial/SpatialDataService.java | 141 ++ .../gis/templates/EchobaseQGisTemplate.qgs | 1870 +++++++++++++++----- .../gis}/templates/LizmapTemplate.qgs.cfg | 0 .../main/resources/gis}/templates/QgisTemplate.qgs | 0 .../services/service/spatial/GisServiceTest.java | 90 + echobase-ui/pom.xml | 105 +- .../echobase/ui/EchoBaseApplicationContext.java | 36 +- .../echobase/ui/actions/EchoBaseActionSupport.java | 15 +- .../echobase/ui/actions/dbeditor/DeleteEntity.java | 4 +- .../echobase/ui/actions/dbeditor/SaveEntity.java | 6 +- .../ui/actions/embeddedApplication/Configure.java | 2 +- .../actions/importData/AbstractLaunchImport.java | 7 +- .../echobase/ui/actions/removeData/Delete.java | 6 +- .../ui/actions/spatial/RefreshSpatialViews.java | 6 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 103 +- .../echobase/ui/actions/spatial/ShowMap.java | 36 - .../ui/actions/spatial/ShowSpatialModel.java | 64 - .../echobase/ui/actions/workingDb/AddSpatial.java | 6 +- .../echobase/ui/actions/workingDb/Information.java | 30 +- .../src/main/resources/config/struts-spatial.xml | 9 - .../resources/i18n/echobase-ui_en_GB.properties | 5 + .../resources/i18n/echobase-ui_fr_FR.properties | 5 + echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 86 +- .../main/webapp/WEB-INF/jsp/spatial/showMap.jsp | 39 - .../webapp/WEB-INF/jsp/workingDb/information.jsp | 16 +- pom.xml | 6 +- src/site/site_fr.xml | 2 +- 45 files changed, 2271 insertions(+), 957 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 http://git.codelutin.com/echobase.git commit 66febc822420ba635860203079dfa0432170e838 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:48 2014 +0000 [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 2c425c4..9457b85 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index e999435..64cbd7d 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 873b59a..d6fa5d1 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 028bd16..5693986 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8-SNAPSHOT</version> + <version>2.7.1</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 http://git.codelutin.com/echobase.git commit dd25b7db0f79490f4b51811df1342303b48beaad Merge: 66febc8 2e1d397 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:48 2014 +0000 Merge branch 'master' into develop .../EchoBaseUserTopiaApplicationContext.java | 21 +++++++++++++++++++++ .../services/service/spatial/GisService.java | 21 +++++++++++++++++++++ .../services/service/spatial/GisServiceTest.java | 21 +++++++++++++++++++++ 3 files changed, 63 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 http://git.codelutin.com/echobase.git commit 27cd9cdb9bf85756cf569ae90445b52169cded99 Author: Maven Release <maven-release@codelutin.com> Date: Tue Dec 16 08:38:49 2014 +0000 [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 9457b85..2c425c4 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 64cbd7d..e999435 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index d6fa5d1..873b59a 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1</version> + <version>2.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 5693986..028bd16 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.7.1</version> + <version>2.8-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