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 649ef30f6eddc8494059734ccb30c228e32d7a5a Merge: d3da33a 84887a1 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 8 17:20:20 2014 +0000 Merge branch 'release/2.7' .gitignore | 15 + R-EchoBase/Baracouda2Echobase.r | 217 + R-EchoBase/R-echobaseLegacyCheck.r | 534 +++ R-EchoBase/R-echobase_functions.r | 26 + echobase-domain/pom.xml | 7 +- .../echobase/config/EchoBaseConfiguration.java | 51 + .../config/EchoBaseConfigurationOption.java | 34 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 2 +- .../i18n/echobase-domain_en_GB.properties | 7 + .../i18n/echobase-domain_fr_FR.properties | 7 + echobase-services/pom.xml | 6 +- .../echobase/services/service/DbEditorService.java | 15 + .../services/service/UserDbPersistenceService.java | 4 + .../exportCoser/ExportCoserConfiguration.java | 76 +- .../service/exportCoser/ExportCoserService.java | 91 +- .../service/importdata/AcousticImportResult.java | 57 + .../service/importdata/AcousticImportService.java | 78 +- .../services/service/spatial/SpatialService.java | 244 ++ .../workingDb/WorkingDbConfigurationService.java | 7 + .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + echobase-ui/pom.xml | 24 +- echobase-ui/src/main/assembly/lizmap-zip.xml | 43 + .../echobase/ui/EchoBaseApplicationContext.java | 41 + .../echobase/ui/EchoBaseApplicationListener.java | 8 + .../echobase/ui/actions/dbeditor/DeleteEntity.java | 84 + .../echobase/ui/actions/dbeditor/ExportTable.java | 13 +- .../echobase/ui/actions/exportCoser/Configure.java | 27 +- .../exportQuery/DownloadExportQueryResult.java | 5 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 33 +- .../echobase/ui/actions/spatial/ShowMap.java | 21 - .../ui/actions/workingDb/DownloadDriver.java | 3 +- .../src/main/resources/config/struts-dbeditor.xml | 6 + .../src/main/resources/config/struts-spatial.xml | 4 +- .../actions/exportCoser/Configure-validation.xml | 16 +- .../resources/i18n/echobase-ui_en_GB.properties | 12 + .../resources/i18n/echobase-ui_fr_FR.properties | 14 + .../resources/lizmap/resources/France&Spain.dbf | Bin 0 -> 277 bytes .../resources/lizmap/resources/France&Spain.prj | 1 + .../resources/lizmap/resources/France&Spain.qpj | 1 + .../resources/lizmap/resources/France&Spain.shp | Bin 0 -> 1692536 bytes .../resources/lizmap/resources/France&Spain.shx | Bin 0 -> 116 bytes .../main/resources/lizmap/resources/pelgas09.avl | 1134 +++++ .../main/resources/lizmap/resources/pelgas09.dbf | Bin 0 -> 434 bytes .../main/resources/lizmap/resources/pelgas09.qix | Bin 0 -> 152 bytes .../main/resources/lizmap/resources/pelgas09.shp | Bin 0 -> 896940 bytes .../main/resources/lizmap/resources/pelgas09.shx | Bin 0 -> 196 bytes .../lizmap/templates/LizmapTemplate.qgs.cfg | 325 ++ .../resources/lizmap/templates/QgisTemplate.qgs | 4530 ++++++++++++++++++++ .../src/main/resources/lizmap/www/js/map.js | 4019 +++++++++++++++++ .../lizmap/www/themes/default/css/admin.css | 28 + .../www/themes/default/css/images/123_click.png | Bin 0 -> 270 bytes .../www/themes/default/css/images/bt_jaune.jpg | Bin 0 -> 1271 bytes .../themes/default/css/images/download_layer.gif | Bin 0 -> 5174 bytes .../www/themes/default/css/images/sprite_18.png | Bin 0 -> 3731 bytes .../www/themes/default/css/images/sprite_20.png | Bin 0 -> 2394 bytes .../themes/default/css/images/sprite_20_black.png | Bin 0 -> 2730 bytes .../themes/default/css/images/sprite_20_tools.png | Bin 0 -> 26490 bytes .../www/themes/default/css/images/sprite_menu.png | Bin 0 -> 2062 bytes .../default/css/images/sprite_menu_tools.png | Bin 0 -> 4871 bytes .../default/css/images/sprite_timemanager.png | Bin 0 -> 730 bytes .../themes/default/css/img/250x250_mappemonde.png | Bin 0 -> 59473 bytes .../lizmap/www/themes/default/css/img/loading.gif | Bin 0 -> 12454 bytes .../lizmap/www/themes/default/css/img/logo.png | Bin 0 -> 6717 bytes .../www/themes/default/css/img/logo_footer.png | Bin 0 -> 1520 bytes .../default/css/img/overview_replacement.gif | Bin 0 -> 100 bytes .../default/css/img/overview_replacement.png | Bin 0 -> 208 bytes .../lizmap/www/themes/default/css/main.css | 133 + .../lizmap/www/themes/default/css/map.css | 540 +++ .../lizmap/www/themes/default/css/media.css | 110 + .../lizmap/www/themes/default/css/view.css | 56 + .../main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp | 4 + .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 122 +- .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 77 +- echobase-ui/src/main/webapp/css/screen.css | 6 + pom.xml | 183 +- src/site/rst/gis.rst | 100 + src/site/rst/install.rst.vm | 81 +- src/site/site_en.xml | 69 +- src/site/site_fr.xml | 71 +- 80 files changed, 12982 insertions(+), 442 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.