branch develop updated (2933074 -> cdde5a7)
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 2933074 [jgitflow-maven-plugin]updating poms for 2.9-SNAPSHOT development new 8cf050e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 1dd83b9 add license headers new f36d7f4 [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions new 0e157a3 Merge branch 'release/2.8' new 415e650 Merge branch 'master' into develop new cdde5a7 [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 cdde5a7d42c93076adb637ada98f5da429bbd5a3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:38:02 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 415e650f36d28361d2a6506f693acd142e06b749 Merge: 8cf050e 0e157a3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:38:01 2015 +0000 Merge branch 'master' into develop commit 8cf050e7ece313d62e15b7f03cb39d5835e734f8 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:38:00 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 0e157a368ac3a607ad5ece901bc5a9ae0721f716 Merge: 57e5d46 f36d7f4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:37:58 2015 +0000 Merge branch 'release/2.8' commit f36d7f4e786dadaf549922476e76ef3f19ff29bf Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:35:48 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.8' with non-snapshot versions commit 1dd83b9ae0c0e818ab18795b2f2e49f941504229 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:35:40 2015 +0000 add license headers Summary of changes: .../exportCoser/GenerateCoserMapException.java | 21 +++++++++++++++++++++ .../services/service/spatial/LizmapRepository.java | 21 +++++++++++++++++++++ .../echobase/ui/actions/spatial/ShowVoyageMap.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 1dd83b9ae0c0e818ab18795b2f2e49f941504229 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:35:40 2015 +0000 add license headers --- .../exportCoser/GenerateCoserMapException.java | 21 +++++++++++++++++++++ .../services/service/spatial/LizmapRepository.java | 21 +++++++++++++++++++++ .../echobase/ui/actions/spatial/ShowVoyageMap.java | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java index 32b5c9c..c3c6d6a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.exportCoser; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 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 java.io.IOException; /** diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java index f9fc3da..abea447 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/LizmapRepository.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.services.service.spatial; +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2015 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 com.google.common.io.Files; diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java index bf85966..2dbe22e 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowVoyageMap.java @@ -1,5 +1,26 @@ package fr.ifremer.echobase.ui.actions.spatial; +/* + * #%L + * EchoBase :: UI + * %% + * Copyright (C) 2011 - 2015 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.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.persistence.JdbcConfiguration; -- 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 f36d7f4e786dadaf549922476e76ef3f19ff29bf Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:35:48 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.8' 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 2c425c4..1b56b40 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.8</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index e999435..a922c20 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.8</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index e8b4406..d511112 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.8</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index a33dd30..0f1c1ce 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.8</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 0e157a368ac3a607ad5ece901bc5a9ae0721f716 Merge: 57e5d46 f36d7f4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:37:58 2015 +0000 Merge branch 'release/2.8' echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 12 +- .../config/EchoBaseConfigurationOption.java | 26 +- .../fr/ifremer/echobase/io/CommandLineUtils.java | 52 ++-- .../i18n/echobase-domain_en_GB.properties | 7 +- .../i18n/echobase-domain_fr_FR.properties | 12 +- echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 33 +++ .../exportCoser/ExportCoserConfiguration.java | 10 + .../service/exportCoser/ExportCoserService.java | 7 +- .../exportCoser/GenerateCoserMapException.java | 33 +-- .../importdata/AbstractImportDataService.java | 24 -- .../importdata/ResultsEsduCellImportService.java | 8 +- .../ResultsMapFishCellImportService.java | 7 +- .../ResultsMapOtherCellImportService.java | 2 +- .../services/service/importdb/ImportDbService.java | 22 +- .../services/service/spatial/GisService.java | 192 ++---------- .../services/service/spatial/LizmapRepository.java | 326 +++++++++++++++++++++ .../service/spatial/SpatialDataService.java | 57 ++-- .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 302 +++++++++++-------- .../gis/templates/EchoBaseQGisTemplate.qgs | 268 +++++++++-------- echobase-ui/pom.xml | 69 ++--- .../assembly/lizmap/www/themes/default/css/map.css | 8 + .../echobase/ui/EchoBaseApplicationContext.java | 2 +- .../ui/actions/AbstractWaitAndExecAction.java | 2 +- .../echobase/ui/actions/exportCoser/Export.java | 19 +- ...shSpatialViews.java => ComputeSpatialData.java} | 8 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 51 +++- .../spatial/{Show.java => ShowVoyageMap.java} | 71 ++++- .../src/main/resources/config/struts-spatial.xml | 13 +- echobase-ui/src/main/resources/echobase.properties | 3 + .../resources/i18n/echobase-ui_en_GB.properties | 3 +- .../resources/i18n/echobase-ui_fr_FR.properties | 3 +- .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 60 ++-- .../jsp/spatial/{show.jsp => showVoyageMap.jsp} | 57 ++-- .../main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 14 +- pom.xml | 14 +- src/site/en/rst/exportCoser.rst | 1 + src/site/rst/exportCoser.rst | 1 + src/site/rst/install.rst.vm | 73 ++--- 40 files changed, 1143 insertions(+), 733 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 8cf050e7ece313d62e15b7f03cb39d5835e734f8 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:38:00 2015 +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 343435c..1b56b40 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.9-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index b16fa8d..a922c20 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.9-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 01fb356..d511112 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.9-SNAPSHOT</version> + <version>2.8</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 28c4eb4..0f1c1ce 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9-SNAPSHOT</version> + <version>2.8</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 415e650f36d28361d2a6506f693acd142e06b749 Merge: 8cf050e 0e157a3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:38:01 2015 +0000 Merge branch 'master' into develop .../exportCoser/GenerateCoserMapException.java | 21 +++++++++++++++++++++ .../services/service/spatial/LizmapRepository.java | 21 +++++++++++++++++++++ .../echobase/ui/actions/spatial/ShowVoyageMap.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 cdde5a7d42c93076adb637ada98f5da429bbd5a3 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 20 17:38:02 2015 +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 1b56b40..343435c 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</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index a922c20..b16fa8d 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</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index d511112..01fb356 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</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 0f1c1ce..28c4eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.8</version> + <version>2.9-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