- Echobase-commits - mailman.cloud.codelutin.com

branch develop updated (fda974b -> 8ff27cb)
by codelutin.com scm Dec. 8, 2014

Dec. 8, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from fda974b fixes #6261: Updates some dependencies new e4d47d7 refs-70 #6054: (ajout des cellules esdu non importées dans les logs et dans le resumé de l'import) new 8ff27cb fixes #6056: Impossible d'exporter une table depuis le menu "modifier données" d'Echobase The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8ff27cb07aa85357b363dbace02bb47ff3ef62d8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Dec 8 14:37:53 2014 +0100 fixes #6056: Impossible d'exporter une table depuis le menu "modifier données" d'Echobase commit e4d47d7d7b4db189ce9171b0dcce851dc47b73c4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Dec 8 12:06:01 2014 +0100 refs-70 #6054: (ajout des cellules esdu non importées dans les logs et dans le resumé de l'import) Summary of changes: ...ImportResult.java => AcousticImportResult.java} | 27 ++++---- .../service/importdata/AcousticImportService.java | 78 ++++++++++++++++------ .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../echobase/ui/actions/dbeditor/ExportTable.java | 13 +++- .../exportQuery/DownloadExportQueryResult.java | 5 +- .../ui/actions/workingDb/DownloadDriver.java | 3 +- 7 files changed, 86 insertions(+), 42 deletions(-) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{EchoBaseCsvFileImportResult.java => AcousticImportResult.java} (63%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (c11b751 -> fda974b)
by codelutin.com scm Dec. 8, 2014

Dec. 8, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from c11b751 add full war bundle to be deployed in maven repository + fix site links new fda974b fixes #6261: Updates some dependencies The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fda974bb3dfefcd828e658e0f4469daa8979effc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Dec 8 11:01:59 2014 +0100 fixes #6261: Updates some dependencies Summary of changes: pom.xml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7143f30 -> c11b751)
by codelutin.com scm Dec. 8, 2014

Dec. 8, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 7143f30 update pom and site layout new c11b751 add full war bundle to be deployed in maven repository + fix site links The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c11b751fb3f721b525bbbd43b37f0e6d7f8b5b4a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Dec 8 10:15:11 2014 +0100 add full war bundle to be deployed in maven repository + fix site links Summary of changes: echobase-ui/pom.xml | 1 + src/site/site_en.xml | 7 +++++-- src/site/site_fr.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (7b41061 -> 7143f30)
by codelutin.com scm Dec. 8, 2014

Dec. 8, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 7b41061 fixes #5919: Migrates to git new 7143f30 update pom and site layout The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7143f307d7693cabb764f95cd48f26956020d8b1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Dec 8 09:22:38 2014 +0100 update pom and site layout Summary of changes: pom.xml | 9 ++----- src/site/site_en.xml | 70 +++++++++------------------------------------------- src/site/site_fr.xml | 68 +++++++++----------------------------------------- 3 files changed, 24 insertions(+), 123 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[echobase] branch develop updated (e410d3b -> 7b41061)
by codelutin.com scm Oct. 3, 2014

Oct. 3, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from e410d3b fixes #5919: Migrates to git new 7b41061 fixes #5919: Migrates to git The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7b410613680bbc430551163e274583e07b8cf654 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 3 21:43:54 2014 +0200 fixes #5919: Migrates to git Summary of changes: R-EchoBase/Baracouda2Echobase.r | 217 +++++++++++++++ R-EchoBase/R-echobaseLegacyCheck.r | 534 +++++++++++++++++++++++++++++++++++++ R-EchoBase/R-echobase_functions.r | 26 ++ 3 files changed, 777 insertions(+) create mode 100644 R-EchoBase/Baracouda2Echobase.r create mode 100644 R-EchoBase/R-echobaseLegacyCheck.r create mode 100644 R-EchoBase/R-echobase_functions.r -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[echobase] branch develop updated (1333a66 -> e410d3b)
by codelutin.com scm Oct. 3, 2014

Oct. 3, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 1333a66 refs #4194 : cache batimetry and eatrh new e410d3b fixes #5919: Migrates to git The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e410d3b092f2352a5ecb372331e46fa2c684e377 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 3 21:40:31 2014 +0200 fixes #5919: Migrates to git Summary of changes: .gitignore | 15 +++++ echobase-domain/pom.xml | 5 +- pom.xml | 153 +++++++++++++++++++++++++++--------------------- 3 files changed, 103 insertions(+), 70 deletions(-) create mode 100644 .gitignore -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[echobase] branch master updated (1333a66 -> d3da33a)
by codelutin.com scm Oct. 3, 2014

Oct. 3, 2014

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 omits 1333a66 refs #4194 : cache batimetry and eatrh omits f480dba refs #4194 : update site omits 2d2e515 refs #4194 : assembly lizmap zip omits 3b5e910 refs #4194 : organize lizmap files omits c169198 refs #4194 : used echobase style in lizmap frame omits 3b2bca2 refs #4194 : in lizmap frame fix position body omits 7187ede refs #4194 : add Lizamp default theme and one javascript omits a086f99 refs #4194 : fix dependencies and lizmpa repository id omits 39a025c refs #4194 : create one repository by data base omits 3188442 refs #4194 : change lizmap directories and files names, create lizmap files is not exists omits b3add9e refs #4194 : add VoyageId in layerId omits 730917e refs #4194 : fixe bluid error in jenkins omits f183fed refs #4194 : Visualisation des données spatiales omits 3a8bfe6 fixes #5186 Export Coser : mettre un message si le site des indicateurs n'est pas accessible omits a83166a fixes #5181: Utilisation coser 1.5-rc-1 omits fab5ee7 fixes #5182: Export coser, mauvais nom d'espèce omits 1948b70 fixes #5180: Améioration de l'export Coser omits 15310b8 fix pom urls + updates to mavenpom 5.0.8 and others libs omits 9e22a10 [maven-release-plugin] prepare for next development iteration adds d3da33a [maven-release-plugin] copy for tag echobase-2.6 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1333a66) \ N -- N -- N refs/heads/master (d3da33a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../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 +- .../services/service/UserDbPersistenceService.java | 4 - .../exportCoser/ExportCoserConfiguration.java | 76 +- .../service/exportCoser/ExportCoserService.java | 91 +- .../services/service/spatial/SpatialService.java | 244 -- .../workingDb/WorkingDbConfigurationService.java | 7 - echobase-ui/pom.xml | 23 +- echobase-ui/src/main/assembly/lizmap-zip.xml | 23 - .../echobase/ui/EchoBaseApplicationContext.java | 41 - .../echobase/ui/EchoBaseApplicationListener.java | 8 - .../echobase/ui/actions/exportCoser/Configure.java | 27 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 33 +- .../echobase/ui/actions/spatial/ShowMap.java | 21 + .../src/main/resources/config/struts-spatial.xml | 4 +- .../actions/exportCoser/Configure-validation.xml | 16 +- .../resources/i18n/echobase-ui_en_GB.properties | 10 - .../resources/i18n/echobase-ui_fr_FR.properties | 10 - .../resources/lizmap/resources/France&Spain.dbf | Bin 277 -> 0 bytes .../resources/lizmap/resources/France&Spain.prj | 1 - .../resources/lizmap/resources/France&Spain.qpj | 1 - .../resources/lizmap/resources/France&Spain.shp | Bin 1692536 -> 0 bytes .../resources/lizmap/resources/France&Spain.shx | Bin 116 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.avl | 1134 ----- .../main/resources/lizmap/resources/pelgas09.dbf | Bin 434 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.qix | Bin 152 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.shp | Bin 896940 -> 0 bytes .../main/resources/lizmap/resources/pelgas09.shx | Bin 196 -> 0 bytes .../lizmap/templates/LizmapTemplate.qgs.cfg | 325 -- .../resources/lizmap/templates/QgisTemplate.qgs | 4530 -------------------- .../src/main/resources/lizmap/www/js/map.js | 3998 ----------------- .../lizmap/www/themes/default/css/admin.css | 8 - .../www/themes/default/css/images/123_click.png | Bin 270 -> 0 bytes .../www/themes/default/css/images/bt_jaune.jpg | Bin 1271 -> 0 bytes .../themes/default/css/images/download_layer.gif | Bin 5174 -> 0 bytes .../www/themes/default/css/images/sprite_18.png | Bin 3731 -> 0 bytes .../www/themes/default/css/images/sprite_20.png | Bin 2394 -> 0 bytes .../themes/default/css/images/sprite_20_black.png | Bin 2730 -> 0 bytes .../themes/default/css/images/sprite_20_tools.png | Bin 26490 -> 0 bytes .../www/themes/default/css/images/sprite_menu.png | Bin 2062 -> 0 bytes .../default/css/images/sprite_menu_tools.png | Bin 4871 -> 0 bytes .../default/css/images/sprite_timemanager.png | Bin 730 -> 0 bytes .../themes/default/css/img/250x250_mappemonde.png | Bin 59473 -> 0 bytes .../lizmap/www/themes/default/css/img/loading.gif | Bin 12454 -> 0 bytes .../lizmap/www/themes/default/css/img/logo.png | Bin 6717 -> 0 bytes .../www/themes/default/css/img/logo_footer.png | Bin 1520 -> 0 bytes .../default/css/img/overview_replacement.gif | Bin 100 -> 0 bytes .../default/css/img/overview_replacement.png | Bin 208 -> 0 bytes .../lizmap/www/themes/default/css/main.css | 113 - .../lizmap/www/themes/default/css/map.css | 520 --- .../lizmap/www/themes/default/css/media.css | 90 - .../lizmap/www/themes/default/css/view.css | 36 - .../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 | 32 +- src/site/rst/install.rst.vm | 102 +- 62 files changed, 196 insertions(+), 11646 deletions(-) delete mode 100644 echobase-ui/src/main/assembly/lizmap-zip.xml delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.dbf delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.prj delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.qpj delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.shp delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/France&Spain.shx delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.avl delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.dbf delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.qix delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.shp delete mode 100644 echobase-ui/src/main/resources/lizmap/resources/pelgas09.shx delete mode 100644 echobase-ui/src/main/resources/lizmap/templates/LizmapTemplate.qgs.cfg delete mode 100644 echobase-ui/src/main/resources/lizmap/templates/QgisTemplate.qgs delete mode 100755 echobase-ui/src/main/resources/lizmap/www/js/map.js delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/admin.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/123_click.png delete mode 100644 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/bt_jaune.jpg delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/download_layer.gif delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_18.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_20.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_20_black.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_20_tools.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_menu.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_menu_tools.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/images/sprite_timemanager.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/250x250_mappemonde.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/loading.gif delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/logo.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/logo_footer.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/overview_replacement.gif delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/img/overview_replacement.png delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/main.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/map.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/media.css delete mode 100755 echobase-ui/src/main/resources/lizmap/www/themes/default/css/view.css -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[echobase] branch develop created (now 1333a66)
by codelutin.com scm Oct. 3, 2014

Oct. 3, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git at 1333a66 refs #4194 : cache batimetry and eatrh No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

r1042 - trunk/echobase-ui/src/main/resources/lizmap/templates
by sbavencoff＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: sbavencoff Date: 2014-07-07 17:07:58 +0200 (Mon, 07 Jul 2014) New Revision: 1042 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1042 Log: refs #4194 : cache batimetry and eatrh Modified: trunk/echobase-ui/src/main/resources/lizmap/templates/LizmapTemplate.qgs.cfg Modified: trunk/echobase-ui/src/main/resources/lizmap/templates/LizmapTemplate.qgs.cfg =================================================================== --- trunk/echobase-ui/src/main/resources/lizmap/templates/LizmapTemplate.qgs.cfg 2014-07-07 14:29:51 UTC (rev 1041) +++ trunk/echobase-ui/src/main/resources/lizmap/templates/LizmapTemplate.qgs.cfg 2014-07-07 15:07:58 UTC (rev 1042) @@ -173,7 +173,8 @@ }, "Bathymetry": { "abstract": "", - "baseLayer": "False", + "cacheExpiration": 86400, + "baseLayer": "false", "noLegendImage": "False", "id": "pelgas{{voyageId}}", "title": "Bathymetry", @@ -184,7 +185,7 @@ "link": "", "toggled": "True", "name": "Bathymetry", - "cached": "False", + "cached": "true", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png", @@ -211,7 +212,8 @@ }, "Country": { "abstract": "", - "baseLayer": "False", + "cacheExpiration": 86400, + "baseLayer": "false", "noLegendImage": "False", "id": "country{{voyageId}}", "title": "Country", @@ -222,7 +224,7 @@ "link": "", "toggled": "True", "name": "Country", - "cached": "False", + "cached": "True", "type": "layer", "maxScale": 1000000000000, "imageFormat": "image/png",

1 0

r1041 - trunk/src/site/rst
by sbavencoff＠users.forge.codelutin.com July 7, 2014

July 7, 2014

Author: sbavencoff Date: 2014-07-07 16:29:51 +0200 (Mon, 07 Jul 2014) New Revision: 1041 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1041 Log: refs #4194 : update site Modified: trunk/src/site/rst/install.rst.vm Modified: trunk/src/site/rst/install.rst.vm =================================================================== --- trunk/src/site/rst/install.rst.vm 2014-07-07 13:42:56 UTC (rev 1040) +++ trunk/src/site/rst/install.rst.vm 2014-07-07 14:29:51 UTC (rev 1041) @@ -311,27 +311,10 @@ * echobase.qgis.template.file : le modèle du fichier Qgis * echobase.qgis.resources.file : le répertoire de ressources des fichiers Qgis * echobase.lizmap.template.file : le modièle du fichier de configuration de Lizmap - * echobase.lizmap.projects.file : le répertoire de dépôt des fichiers Qgis et lizmap + * echobase.lizmap.projects.file : le répertoire de dépôt des fichiers Qgis et Lizmap - 2. Configuration de lizmap + 2. Configuration de Lizmap - Il faut indiquer à lizmap le repertoir où trouver les fichiers Qgis et de configuration. - - Allez sur la page d'administration de Lizmap - - :: - - http://localhost/lizmap-web-client-2.9.4/lizmap/www/admin.php - login / password : admin / admin - - Dans lizmap Configuration cliquez sur *Create a repository* - - * *id* : l'identifiant du dépôt, doit etre identique à la propriété **echobase.lizmap.repository** (par défaut "echobase") - * *Label* : Le label utilisé par lizmap - * *path* : le répertoire de dépôt des fichiers Qgis et lizmap (par défaut **/var/local/echobase/data/lizmap/projects/**) doit finir par un "/" - - Cliquez sur *save* - - Dans la partie *View repositories*, cochez *anonymous* - - Cliquez sur *save* + Pour utiliser le style du portail Echobase et non le style par defaut de Lizmap, + vous devez extraire les fichier **echobase-lizmap-XX.XX.zip** dans le répertoire d'installation de Lizmap. + (par défaut : **/var/www/lizmap-web-client-X.X.X/lizmap/** )

1 0