branch develop updated (2ccccce -> 80b5bc5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See http://git.codelutin.com/coser.git from 2ccccce [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new 8fcf84e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 721dd08 [maven-release-plugin] copy for tag coser-1.5-rc-1 new 83fa5d3 prepare release 1.5 new 8c66d3c [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions new 4995763 Merge branch 'release/1.5' new e0f2502 Merge branch 'master' into develop new 80b5bc5 [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 80b5bc505898adbde5aae99994b1ea62ae5b4b1e Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:31 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e0f2502aadc27868b211e58fbdd4fae43ba2656c Merge: 8fcf84e 4995763 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:30 2014 +0000 Merge branch 'master' into develop commit 8fcf84e691045be8837dfcddf74e25c42fc4520f Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:30 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 49957631351afe0d41db8c4767d1274ce8ecce8c Merge: 721dd08 8c66d3c Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:29 2014 +0000 Merge branch 'release/1.5' commit 8c66d3ce799e18f82dab53d45fa8f09a067ce68a Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:55:38 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions commit 83fa5d35730600f1dcc35583ede31c4aaa9aaac0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:55:22 2014 +0000 prepare release 1.5 Summary of changes: ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++++++++++++++++++++++ ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++++++++++++++++++++++ ...tMatchingRepositoryTypeForMapResultRequest.java | 22 ++++++++++++++++++++++ .../ifremer/coser/CoserUIApplicationContext.java | 4 ++-- .../coser/web/actions/admin/package-info.java | 21 +++++++++++++++++++++ .../coser/web/actions/auth/package-info.java | 21 +++++++++++++++++++++ 6 files changed, 110 insertions(+), 2 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 coser. See http://git.codelutin.com/coser.git commit 83fa5d35730600f1dcc35583ede31c4aaa9aaac0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:55:22 2014 +0000 prepare release 1.5 --- ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++++++++++++++++++++++ ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++++++++++++++++++++++ ...tMatchingRepositoryTypeForMapResultRequest.java | 22 ++++++++++++++++++++++ .../ifremer/coser/CoserUIApplicationContext.java | 4 ++-- .../coser/web/actions/admin/package-info.java | 21 +++++++++++++++++++++ .../coser/web/actions/auth/package-info.java | 21 +++++++++++++++++++++ 6 files changed, 110 insertions(+), 2 deletions(-) diff --git a/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetMatchingRepositoryTypeForMapResultCommand.java b/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetMatchingRepositoryTypeForMapResultCommand.java index 497d99b..a1fe48d 100644 --- a/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetMatchingRepositoryTypeForMapResultCommand.java +++ b/coser-business/src/main/java/fr/ifremer/coser/result/repository/echobase/command/GetMatchingRepositoryTypeForMapResultCommand.java @@ -1,5 +1,27 @@ package fr.ifremer.coser.result.repository.echobase.command; +/* + * #%L + * Coser :: Business + * %% + * Copyright (C) 2010 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import fr.ifremer.coser.result.request.GetMatchingRepositoryTypeForMapResultRequest; import fr.ifremer.coser.result.result.VoidResult; diff --git a/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/GetMatchingRepositoryTypeForMapResultCommand.java b/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/GetMatchingRepositoryTypeForMapResultCommand.java index 2d94e4d..a6ce468 100644 --- a/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/GetMatchingRepositoryTypeForMapResultCommand.java +++ b/coser-business/src/main/java/fr/ifremer/coser/result/repository/legacy/command/GetMatchingRepositoryTypeForMapResultCommand.java @@ -1,5 +1,27 @@ package fr.ifremer.coser.result.repository.legacy.command; +/* + * #%L + * Coser :: Business + * %% + * Copyright (C) 2010 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import fr.ifremer.coser.result.request.GetMatchingRepositoryTypeForMapResultRequest; import fr.ifremer.coser.result.result.VoidResult; diff --git a/coser-business/src/main/java/fr/ifremer/coser/result/request/GetMatchingRepositoryTypeForMapResultRequest.java b/coser-business/src/main/java/fr/ifremer/coser/result/request/GetMatchingRepositoryTypeForMapResultRequest.java index 2279c48..03d66c9 100644 --- a/coser-business/src/main/java/fr/ifremer/coser/result/request/GetMatchingRepositoryTypeForMapResultRequest.java +++ b/coser-business/src/main/java/fr/ifremer/coser/result/request/GetMatchingRepositoryTypeForMapResultRequest.java @@ -1,5 +1,27 @@ package fr.ifremer.coser.result.request; +/* + * #%L + * Coser :: Business + * %% + * Copyright (C) 2010 - 2014 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.coser.result.CoserRequest; diff --git a/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java b/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java index 4c50e1f..751e981 100644 --- a/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java +++ b/coser-ui/src/main/java/fr/ifremer/coser/CoserUIApplicationContext.java @@ -10,12 +10,12 @@ package fr.ifremer.coser; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. diff --git a/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/package-info.java b/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/package-info.java index 4fa06a8..b268656 100644 --- a/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/package-info.java +++ b/coser-web/src/main/java/fr/ifremer/coser/web/actions/admin/package-info.java @@ -4,4 +4,25 @@ @ParentPackage("admin") package fr.ifremer.coser.web.actions.admin; +/* + * #%L + * Coser :: Web + * %% + * Copyright (C) 2010 - 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.struts2.convention.annotation.ParentPackage; \ No newline at end of file diff --git a/coser-web/src/main/java/fr/ifremer/coser/web/actions/auth/package-info.java b/coser-web/src/main/java/fr/ifremer/coser/web/actions/auth/package-info.java index 4845988..bc8a7b5 100644 --- a/coser-web/src/main/java/fr/ifremer/coser/web/actions/auth/package-info.java +++ b/coser-web/src/main/java/fr/ifremer/coser/web/actions/auth/package-info.java @@ -2,3 +2,24 @@ * Package for auth actions (login-logout). */ package fr.ifremer.coser.web.actions.auth; + +/* + * #%L + * Coser :: Web + * %% + * Copyright (C) 2010 - 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% + */ -- 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 coser. See http://git.codelutin.com/coser.git commit 8c66d3ce799e18f82dab53d45fa8f09a067ce68a Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:55:38 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 016911e..7b1d85f 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 7c23ee1..3d8dab8 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index d637f89..82a9bba 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 634c3f1..c61eb48 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <packaging>pom</packaging> <name>Coser</name> -- 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 coser. See http://git.codelutin.com/coser.git commit 49957631351afe0d41db8c4767d1274ce8ecce8c Merge: 721dd08 8c66d3c Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:29 2014 +0000 Merge branch 'release/1.5' .gitignore | 14 ++ coser-business/pom.xml | 25 +- .../main/java/fr/ifremer/coser/bean/ZoneMap.java | 268 +++++++++++++++++---- .../ifremer/coser/result/CoserRequestExecutor.java | 46 +++- .../echobase/command/AbstractEchoBaseCommand.java | 26 +- .../command/ExtractRawDataAndResultsCommand.java | 23 +- .../echobase/command/ExtractRawDataCommand.java | 52 +++- ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++ ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++ ...tMatchingRepositoryTypeForMapResultRequest.java | 22 ++ .../ifremer/coser/services/WebResultService.java | 25 ++ .../fr/ifremer/coser/storage/DataStorages.java | 8 +- .../resources/i18n/coser-business_en_GB.properties | 6 +- .../resources/i18n/coser-business_fr_FR.properties | 4 +- coser-business/src/site/site_en.xml | 25 -- coser-business/src/site/site_fr.xml | 25 -- coser-ui/pom.xml | 45 ++-- .../main/java/fr/ifremer/coser/CoserConfig.java | 2 +- .../ifremer/coser/CoserUIApplicationContext.java | 4 +- .../coser/ui/control/GlobalControlErrorModel.java | 6 +- coser-ui/src/main/jnlp/coser-jnlp.vm | 2 +- coser-ui/src/site/site_en.xml | 29 +-- coser-ui/src/site/site_fr.xml | 29 +-- coser-web/pom.xml | 3 +- .../coser/web/CoserApplicationListener.java | 26 ++ .../java/fr/ifremer/coser/web/ServiceHelper.java | 8 +- .../coser/web/actions/admin/package-info.java | 21 ++ .../coser/web/actions/auth/package-info.java | 21 ++ .../coser/web/actions/pop/GraphDataAction.java | 17 -- .../coser/web/actions/pop/GraphDownloadAction.java | 18 -- .../coser/web/actions/source/SourceDataAction.java | 31 +-- .../main/resources/i18n/coser-web_en_GB.properties | 6 +- .../main/resources/i18n/coser-web_fr_FR.properties | 4 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 +- .../main/webapp/WEB-INF/decorators/sublayout.jsp | 2 +- .../src/main/webapp/images/zones/C_Pelgas.png | Bin 0 -> 79445 bytes coser-web/src/site/site_en.xml | 29 +-- coser-web/src/site/site_fr.xml | 29 +-- pom.xml | 161 +++++++++---- src/site/site_en.xml | 151 +++++------- src/site/site_fr.xml | 152 +++++------- 41 files changed, 820 insertions(+), 591 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 coser. See http://git.codelutin.com/coser.git commit 8fcf84e691045be8837dfcddf74e25c42fc4520f Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:30 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 8a0163c..7b1d85f 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index c05c868..3d8dab8 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index adfec90..82a9bba 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 78ced4d..c61eb48 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5</version> <packaging>pom</packaging> <name>Coser</name> -- 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 coser. See http://git.codelutin.com/coser.git commit e0f2502aadc27868b211e58fbdd4fae43ba2656c Merge: 8fcf84e 4995763 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:30 2014 +0000 Merge branch 'master' into develop ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++++++++++++++++++++++ ...tMatchingRepositoryTypeForMapResultCommand.java | 22 ++++++++++++++++++++++ ...tMatchingRepositoryTypeForMapResultRequest.java | 22 ++++++++++++++++++++++ .../ifremer/coser/CoserUIApplicationContext.java | 4 ++-- .../coser/web/actions/admin/package-info.java | 21 +++++++++++++++++++++ .../coser/web/actions/auth/package-info.java | 21 +++++++++++++++++++++ 6 files changed, 110 insertions(+), 2 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 coser. See http://git.codelutin.com/coser.git commit 80b5bc505898adbde5aae99994b1ea62ae5b4b1e Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 14:58:31 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 7b1d85f..8a0163c 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 3d8dab8..c05c868 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 82a9bba..adfec90 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index c61eb48..78ced4d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm