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 8134c36471755d179766fd840c482a5aec890dd8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 15 13:50:20 2015 +0100 change map ulr option for lizmap --- .../main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java | 4 ++-- .../fr/ifremer/echobase/config/EchoBaseConfigurationOption.java | 6 +++--- .../src/main/resources/i18n/echobase-domain_en_GB.properties | 4 ++-- .../src/main/resources/i18n/echobase-domain_fr_FR.properties | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java index 277118c..fbb1026 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfiguration.java @@ -332,8 +332,8 @@ public class EchoBaseConfiguration { return jdbcUrl; } - public String getLizmapApplicationUrl() { - String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_URL.key); + public String getLizmapApplicationMapUrl() { + String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_MAP_URL.key); return url; } diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java index 237b0ae..a662ae0 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/config/EchoBaseConfigurationOption.java @@ -127,9 +127,9 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.lizmap.application.config.file.description"), "${echobase.lizmap.application.basedir}/lizmap/var/config/lizmapConfig.ini.php", File.class), - LIZMAP_APPLICATION_URL("echobase.lizmap.application.url", - n("echobase.config.lizmap.application.url.description"), - "http://localhost/lizmap-web-client-${echobase.lizmap.application.version}/lizmap/www/index.php/view/", + LIZMAP_APPLICATION_MAP_URL("echobase.lizmap.application.map.url", + n("echobase.config.lizmap.application.map.url.description"), + "http://localhost/lizmap-web-client-${echobase.lizmap.application.version}/lizmap/www/index.php/view/map", String.class), LIZMAP_APPLICATION_JDBC_URL("echobase.lizmap.application.jdbc.url", n("echobase.config.lizmap.application.jdbc.url.description"), diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties index 092e643..6e10891 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_en_GB.properties @@ -39,12 +39,12 @@ echobase.config.internal.db.directory.description=Directory of the internal data echobase.config.lib.directory.description=Directory where to put internal libraries (jdbc drivers, embedded war) echobase.config.lizmap.application.basedir.description=Lizmap application basedir echobase.config.lizmap.application.config.file.description=Config file of Lizmap application +echobase.config.lizmap.application.jdbc.url.description=JDBC URL for Lizmap data base +echobase.config.lizmap.application.map.url.description=Lizmap URL to access to a map echobase.config.lizmap.application.version.description=Version of Lizmap echobase.config.lizmap.config.file.description=Lizmap configuration file -echobase.config.lizmap.application.jdbc.url.description=JDBC URL for lizmap data base echobase.config.lizmap.projects.directory.description=Directory where to store generated lizMap projects echobase.config.lizmap.template.file.description=Lizmap configuration file template -echobase.config.lizmap.application.url.description=Lizmap URL echobase.config.log.config.file.description=Log configuration file echobase.config.postgresqlVersion.description=Postgresql driver version echobase.config.qgis.resources.directory.description=Directory where to store any resources used by Qgis projets (such as maps,...) diff --git a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties index 0a7d9cb..25e4180 100644 --- a/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties +++ b/echobase-domain/src/main/resources/i18n/echobase-domain_fr_FR.properties @@ -39,8 +39,8 @@ echobase.config.internal.db.directory.description=Répertoire de la base interne echobase.config.lib.directory.description=Chemin où sont stockés les libraires internes (drivers + application embarquée) echobase.config.lizmap.application.basedir.description=Le répertoire de base de l'installation de Lizmap echobase.config.lizmap.application.config.file.description=Fichier de configuration de Lizmap -echobase.config.lizmap.application.jdbc.url.description=URL JDBC de la base Lizmap -echobase.config.lizmap.application.url.description=L'URL de Lizmap +echobase.config.lizmap.application.jdbc.url.description=Url d'accès à la base Lizmap +echobase.config.lizmap.application.map.url.description=Url pour accéder à une carte de Lizmap echobase.config.lizmap.application.version.description=Version de Lizmap echobase.config.lizmap.projects.directory.description=Répertoire de génération des projets Lizmap echobase.config.lizmap.template.file.description=Le modèle du fichier de configuration de Lizmap pour une campagne -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.