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>.