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