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 169b3545393830dd439d798b2836bcce06726b97 Merge: 2d2ba7a cb9168b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 16 09:29:22 2014 +0100 refs-50 #6271 : validation du fichier genere Merge branch 'feature/6271' into develop .../echobase/config/EchoBaseConfiguration.java | 2 +- .../config/EchoBaseConfigurationOption.java | 2 +- .../entities/EchoBaseUserPersistenceContext.java | 19 +- .../EchoBaseUserTopiaApplicationContext.java | 127 ++ .../EchoBaseUserTopiaPersistenceContext.java | 48 +- .../workingDb/MigrationCallBackForVersion2_2.java | 2 +- .../MigrationCallBackForVersion2_5_1.java | 2 +- .../workingDb/MigrationCallBackForVersion2_6.java | 2 +- .../MigrationCallBackForVersion2_6_1.java | 2 +- .../services/service/UserDbPersistenceService.java | 15 +- .../importdata/AbstractImportDataService.java | 6 +- .../services/service/importdb/ImportDbService.java | 14 +- .../{SpatialService.java => GisService.java} | 219 +-- .../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 | 69 + .../echobase/ui/EchoBaseApplicationContext.java | 36 +- .../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 + .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 86 +- .../webapp/WEB-INF/jsp/workingDb/information.jsp | 16 +- pom.xml | 4 +- 36 files changed, 2079 insertions(+), 892 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.