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 2d00b87625994f1e24298c85a376580ccc169aa2 Merge: 721dd08 32289d9 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 22 13:26:19 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 | 6 +- .../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, 804 insertions(+), 568 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.