This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See http://git.codelutin.com/echobase.git from 649ef30 Merge branch 'release/2.7' adds c41c581 [jgitflow-maven-plugin]updating poms for 2.8-SNAPSHOT development adds ec7ef43 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4111c64 Merge branch 'master' into develop adds 0a48322 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f5cf4e1 fix release build adds 3884890 fix site url adds b84131a fixes #6279: Les liens sur la documentation ne sont pas corrects adds 7b99549 fixes #6279: Les liens sur la documentation ne sont pas corrects adds d911de9 fixes #6279: Les liens sur la documentation ne sont pas corrects adds e611def fix typo adds 238598e remove unused jsp adds b01168d refs #6054 add more logs for acoustic import adds 2d2ba7a fixes #6275: Faire fonctionner la génération des cartes pour l'export Coser adds 209e549 fixes #6269: Problème de chargement de l'écran spatial sur l'application embarquée adds 12577fc fixes #6269: Problème de chargement de l'écran spatial sur l'application embarquée adds 31ade09 ajout lien sur doc d'install de lizmap adds 90014ce utilisation nuiton-utils 3.0-rc-8 et nuiton-config 3.0-rc-2 adds 01c680b fix i18n adds cb9168b debut de debug de generation de fichier qgis adds 169b354 refs-50 #6271 : validation du fichier genere Merge branch 'feature/6271' into develop adds 6d79458 [jgitflow-maven-plugin]updating poms for branch '2.7.1' with snapshot versions adds 2ba1d6e add license headers adds 4a8fd88 [jgitflow-maven-plugin]updating poms for branch'release/2.7.1' with non-snapshot versions adds 2e1d397 Merge branch 'release/2.7.1' No new revisions were added by this update. Summary of changes: 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(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaApplicationContext.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/{SpatialService.java => GisService.java} (66%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialDataService.java copy echobase-ui/src/main/resources/lizmap/templates/QgisTemplate.qgs => echobase-services/src/main/resources/gis/templates/EchobaseQGisTemplate.qgs (72%) rename {echobase-ui/src/main/resources/lizmap => echobase-services/src/main/resources/gis}/templates/LizmapTemplate.qgs.cfg (100%) rename {echobase-ui/src/main/resources/lizmap => echobase-services/src/main/resources/gis}/templates/QgisTemplate.qgs (100%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/GisServiceTest.java delete mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java delete mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowSpatialModel.java delete mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.