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 2e1d397 Merge branch 'release/2.7.1' adds a05ae57 [jgitflow-maven-plugin]updating poms for 2.8-SNAPSHOT development adds 66febc8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds dd25b7d Merge branch 'master' into develop adds 27cd9cd [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds d70c7c5 fixes #6318: Les données spatiales de pêche ne sont pas recalculées adds e191a8d fixes #6319: Revoir les espèces utilisées pour les exports d'indicateurs adds daf96bd refs #6271 : correction de la template qgis et suppression de l'ancienne adds b14ee63 refs #6271 revue de la configuration et des fichiers à charger au démarrage adds 1df40b6 refs #6271 revue de la configuration et des fichiers à charger au démarrage + normalisation des noms de templates adds f4375c9 remove commented code adds 784aa47 refs #6271 move gis resources to service module (used for tests) adds d6992ad refs #6271 move gis resources to service module (used for tests) adds 654a19f refs #6271 missing resourcePath variable in Qgis template adds 26be897 refs #6271 code review adds 8513de8 refs #6271 add resources copy while test adds e57ac8a fix qgis resources :( bad-bad-bad api adds d9fad08 remove lizmap theme from classpath resources, only used in assembly archive adds 5074a4a refs #6271 ne pas avoir une base en auto-commit adds 167ac7e always escape project description adds af22f3f simplify generated file name build adds 01e4701 fix test adds 4c41bae add big fixme... adds a5a2517 clean pom adds adaa1e7 fix site project url adds c9c713b fixes #6359: Utiliser coser 1.5 adds 55c6ad6 ajout de l'entite sur le modele adds e433083 ajout d'une method pour savoir si on est sur pg (pour les migrations) adds 33d235e normalisation des emplacements de fichiers de migration adds c846e80 ajout migration 2.7.2 + normalisation des autres scripts de migration adds c0a5ab3 on passe en jdk 7 adds 7db77e5 enregistrement des fichiers d'import adds 7fb88d9 recuperer les fichiers d'import adds f5ec58a pouvoir telecharger les fichier d'import sur l'ecran de tableau de bord adds c22cec5 fixes #6367 adds 49aae3d fixes #6220: Ajouter automatiquement le suffixe du serveur en cours dans l'URL lors de la création d'une base adds 6932ab7 fixes #6220 (ne pas modifier l'url en cas de clone) adds a577d26 fixes #6270: Problème de feuille de style si plusieurs notifications adds 10d15f0 fixes #6359: Utiliser coser 1.5.1 adds 669c86d fixes #6359: Utiliser coser 1.5.2 adds 4a6431c [jgitflow-maven-plugin]updating poms for branch '2.7.2' with snapshot versions adds ac756f4 prepare release 2.7.2 adds 03d71f4 [jgitflow-maven-plugin]updating poms for branch'release/2.7.2' with non-snapshot versions adds 57e5d46 Merge branch 'release/2.7.2' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../echobase/config/EchoBaseConfiguration.java | 45 +- .../config/EchoBaseConfigurationOption.java | 54 +- .../entities/EchoBaseUserPersistenceContext.java | 1 + .../EchoBaseUserTopiaApplicationContext.java | 56 +- .../EchoBaseUserTopiaPersistenceContext.java | 8 + .../echobase/entities/references/Species2.java | 54 + .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 7 +- .../internalDb/MigrationCallBackForVersion.java | 14 + .../workingDb/MigrationCallBackForVersion.java | 39 + .../workingDb/MigrationCallBackForVersion2_2.java | 3 +- .../MigrationCallBackForVersion2_5_1.java | 9 +- .../workingDb/MigrationCallBackForVersion2_6.java | 5 +- .../MigrationCallBackForVersion2_6_1.java | 5 +- ....java => MigrationCallBackForVersion2_7_2.java} | 33 +- ...migration.workingDb.MigrationCallBackForVersion | 3 +- .../i18n/echobase-domain_en_GB.properties | 7 +- .../i18n/echobase-domain_fr_FR.properties | 7 +- .../2.5.1-0-postgis-structure.sql} | 0 .../2.5.1-1-postgis-view.sql} | 0 .../2.6-0-postgis-view.sql} | 0 .../2.6.1-0-postgis-structure.sql} | 0 .../migration/workingDb/2.7.2-0-postgis-view.sql | 63 + .../workingDb/h2/2.7.2-1-add-importFile-entity.sql | 23 + .../workingDb/pg/2.7.2-1-add-importFile-entity.sql | 23 + .../src/main/resources/postgis-view.sql | 6 +- echobase-domain/src/main/xmi/echobase.properties | 2 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89097 -> 89705 bytes echobase-services/pom.xml | 2 +- .../services/service/UserDbPersistenceService.java | 67 +- .../EmbeddedApplicationService.java | 21 - .../service/exportCoser/ExportCoserService.java | 65 +- .../importdata/AbstractImportDataService.java | 51 +- .../services/service/spatial/GisService.java | 244 +- ...late.qgs.cfg => EchoBaseLizmapTemplate.qgs.cfg} | 0 ...seQGisTemplate.qgs => EchoBaseQGisTemplate.qgs} | 10 +- .../main/resources/gis/templates/QgisTemplate.qgs | 4530 -------------------- .../services/service/spatial/GisServiceTest.java | 13 +- .../gis}/lizmap/resources/France&Spain.dbf | Bin .../gis}/lizmap/resources/France&Spain.prj | 0 .../gis}/lizmap/resources/France&Spain.qpj | 0 .../gis}/lizmap/resources/France&Spain.shp | Bin .../gis}/lizmap/resources/France&Spain.shx | Bin .../resources/gis}/lizmap/resources/pelgas09.avl | 0 .../resources/gis}/lizmap/resources/pelgas09.dbf | Bin .../resources/gis}/lizmap/resources/pelgas09.qix | Bin .../resources/gis}/lizmap/resources/pelgas09.shp | Bin .../resources/gis}/lizmap/resources/pelgas09.shx | Bin echobase-ui/pom.xml | 2 +- echobase-ui/src/main/assembly/lizmap-zip.xml | 2 +- .../{resources => assembly}/lizmap/www/js/map.js | 0 .../lizmap/www/themes/default/css/admin.css | 0 .../www/themes/default/css/images/123_click.png | Bin .../www/themes/default/css/images/bt_jaune.jpg | Bin .../themes/default/css/images/download_layer.gif | Bin .../www/themes/default/css/images/sprite_18.png | Bin .../www/themes/default/css/images/sprite_20.png | Bin .../themes/default/css/images/sprite_20_black.png | Bin .../themes/default/css/images/sprite_20_tools.png | Bin .../www/themes/default/css/images/sprite_menu.png | Bin .../default/css/images/sprite_menu_tools.png | Bin .../default/css/images/sprite_timemanager.png | Bin .../themes/default/css/img/250x250_mappemonde.png | Bin .../lizmap/www/themes/default/css/img/loading.gif | Bin .../lizmap/www/themes/default/css/img/logo.png | Bin .../www/themes/default/css/img/logo_footer.png | Bin .../default/css/img/overview_replacement.gif | Bin .../default/css/img/overview_replacement.png | Bin .../lizmap/www/themes/default/css/main.css | 0 .../lizmap/www/themes/default/css/map.css | 0 .../lizmap/www/themes/default/css/media.css | 0 .../lizmap/www/themes/default/css/view.css | 0 .../echobase/ui/EchoBaseApplicationContext.java | 52 +- .../echobase/ui/actions/workingDb/Create.java | 8 + .../DownloadImportFile.java} | 89 +- .../ui/actions/workingDb/GetImportLogDetail.java | 9 + .../src/main/resources/config/struts-workingDb.xml | 12 + .../{ => gis}/lizmap/resources/France&Spain.dbf | Bin .../{ => gis}/lizmap/resources/France&Spain.prj | 0 .../{ => gis}/lizmap/resources/France&Spain.qpj | 0 .../{ => gis}/lizmap/resources/France&Spain.shp | Bin .../{ => gis}/lizmap/resources/France&Spain.shx | Bin .../{ => gis}/lizmap/resources/pelgas09.avl | 0 .../{ => gis}/lizmap/resources/pelgas09.dbf | Bin .../{ => gis}/lizmap/resources/pelgas09.qix | Bin .../{ => gis}/lizmap/resources/pelgas09.shp | Bin .../{ => gis}/lizmap/resources/pelgas09.shx | Bin .../resources/i18n/echobase-ui_en_GB.properties | 2 + .../resources/i18n/echobase-ui_fr_FR.properties | 2 + .../webapp/WEB-INF/decorators/layout-default.jsp | 9 +- .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 53 +- .../main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 38 +- echobase-ui/src/main/webapp/css/screen.css | 19 +- echobase-ui/src/main/webapp/js/test.js | 65 - pom.xml | 21 +- src/site/site_en.xml | 2 +- src/site/site_fr.xml | 2 +- 97 files changed, 933 insertions(+), 4926 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Species2.java copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_5_1.java => MigrationCallBackForVersion2_7_2.java} (69%) rename echobase-domain/src/main/resources/migration/{postgis-structure-2.5.1.sql => workingDb/2.5.1-0-postgis-structure.sql} (100%) rename echobase-domain/src/main/resources/migration/{postgis-view-2.5.1.sql => workingDb/2.5.1-1-postgis-view.sql} (100%) rename echobase-domain/src/main/resources/migration/{postgis-view-2.6.sql => workingDb/2.6-0-postgis-view.sql} (100%) rename echobase-domain/src/main/resources/migration/{postgis-structure-2.6.1.sql => workingDb/2.6.1-0-postgis-structure.sql} (100%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/2.7.2-0-postgis-view.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/2.7.2-1-add-importFile-entity.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/2.7.2-1-add-importFile-entity.sql rename echobase-services/src/main/resources/gis/templates/{LizmapTemplate.qgs.cfg => EchoBaseLizmapTemplate.qgs.cfg} (100%) rename echobase-services/src/main/resources/gis/templates/{EchobaseQGisTemplate.qgs => EchoBaseQGisTemplate.qgs} (99%) delete mode 100644 echobase-services/src/main/resources/gis/templates/QgisTemplate.qgs copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/France&Spain.dbf (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/France&Spain.prj (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/France&Spain.qpj (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/France&Spain.shp (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/France&Spain.shx (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/pelgas09.avl (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/pelgas09.dbf (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/pelgas09.qix (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/pelgas09.shp (100%) copy {echobase-ui/src/main/resources => echobase-services/src/test/resources/gis}/lizmap/resources/pelgas09.shx (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/js/map.js (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/admin.css (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/123_click.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/bt_jaune.jpg (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/download_layer.gif (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/sprite_18.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/sprite_20.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/sprite_20_black.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/sprite_20_tools.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/sprite_menu.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/sprite_menu_tools.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/images/sprite_timemanager.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/img/250x250_mappemonde.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/img/loading.gif (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/img/logo.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/img/logo_footer.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/img/overview_replacement.gif (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/img/overview_replacement.png (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/main.css (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/map.css (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/media.css (100%) rename echobase-ui/src/main/{resources => assembly}/lizmap/www/themes/default/css/view.css (100%) copy echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/{exportQuery/DownloadExportQueryResult.java => workingDb/DownloadImportFile.java} (50%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/France&Spain.dbf (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/France&Spain.prj (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/France&Spain.qpj (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/France&Spain.shp (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/France&Spain.shx (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/pelgas09.avl (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/pelgas09.dbf (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/pelgas09.qix (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/pelgas09.shp (100%) rename echobase-ui/src/main/resources/{ => gis}/lizmap/resources/pelgas09.shx (100%) delete mode 100644 echobase-ui/src/main/webapp/js/test.js -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.