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 57e5d46a7b8f0abb016084bdf9b980f22daf972f Merge: 2e1d397 03d71f4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 19:41:37 2015 +0000 Merge branch 'release/2.7.2' 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 + .../ui/actions/workingDb/DownloadImportFile.java | 116 + .../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, 998 insertions(+), 4888 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.