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 9845bfa35690e46b800dcaf6641cd027b8160402 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:05:22 2015 +0100 improve lizmap configuration options --- .../echobase/config/EchoBaseConfiguration.java | 12 +++++----- .../config/EchoBaseConfigurationOption.java | 26 ++++++++++++++-------- .../i18n/echobase-domain_en_GB.properties | 7 ++++-- .../i18n/echobase-domain_fr_FR.properties | 12 +++++----- .../services/service/spatial/GisService.java | 6 ++--- .../echobase/ui/EchoBaseApplicationContext.java | 2 +- echobase-ui/src/main/resources/echobase.properties | 3 +++ 7 files changed, 42 insertions(+), 26 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 0fb43ce..277118c 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 @@ -319,21 +319,21 @@ public class EchoBaseConfiguration { return file; } - public File getLizmapConfigFile() { + public File getLizmapApplicationConfigFile() { File file = applicationConfig.getOptionAsFile( - EchoBaseConfigurationOption.LIZMAP_CONFIG_FILE.key); + EchoBaseConfigurationOption.LIZMAP_APPLICATION_CONFIG_FILE.key); Preconditions.checkNotNull(file); return file; } - public String getLizmapJdbcUrl() { + public String getLizmapApplicationJdbcUrl() { String jdbcUrl = applicationConfig.getOption( - EchoBaseConfigurationOption.LIZMAP_JDBC_URL.key); + EchoBaseConfigurationOption.LIZMAP_APPLICATION_JDBC_URL.key); return jdbcUrl; } - public String getLizmapUrl() { - String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_URL.key); + public String getLizmapApplicationUrl() { + String url = applicationConfig.getOption(EchoBaseConfigurationOption.LIZMAP_APPLICATION_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 86712b6..237b0ae 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 @@ -115,17 +115,25 @@ public enum EchoBaseConfigurationOption implements ConfigOptionDef { n("echobase.config.lizmap.projects.directory.description"), "${echobase.gis.directory}/projects", File.class), - LIZMAP_CONFIG_FILE("echobase.lizmap.config.file", - n("echobase.config.lizmap.config.file.description"), - "/var/www/lizmap-web-client-2.9.4/lizmap/var/config/lizmapConfig.ini.php", + LIZMAP_APPLICATION_VERSION("echobase.lizmap.application.version", + n("echobase.config.lizmap.application.version.description"), + "", + Version.class), + LIZMAP_APPLICATION_BASEDIR("echobase.lizmap.application.basedir", + n("echobase.config.lizmap.application.basedir.description"), + "/var/www/lizmap-web-client-${echobase.lizmap.application.version}", File.class), - LIZMAP_URL("echobase.lizmap.url", - n("echobase.config.lizmap.url.description"), - "http://localhost/lizmap-web-client-2.9.4/lizmap/www/index.php/view/", + LIZMAP_APPLICATION_CONFIG_FILE("echobase.lizmap.application.config.file", + 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/", String.class), - LIZMAP_JDBC_URL("echobase.lizmap.jdbc.url", - n("echobase.config.lizmap.jdbc.url.description"), - "jdbc:sqlite:/var/www/lizmap-web-client-2.9.4/lizmap/var/jauth.db", + LIZMAP_APPLICATION_JDBC_URL("echobase.lizmap.application.jdbc.url", + n("echobase.config.lizmap.application.jdbc.url.description"), + "jdbc:sqlite:${echobase.lizmap.application.basedir}/lizmap/var/jauth.db", String.class), LIZMAP_REPOSITORY_NAME("echobase.lizmap.repositoryName", n("echobase.lizmap.repositoryName.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 d2a5c2a..092e643 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 @@ -37,11 +37,14 @@ echobase.config.gis.templates.directory.description=Directory where to store tem echobase.config.h2Version.description=H2 jdbc driver version echobase.config.internal.db.directory.description=Directory of the internal database 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.version.description=Version of Lizmap echobase.config.lizmap.config.file.description=Lizmap configuration file -echobase.config.lizmap.jdbc.url.description=JDBC URL for lizmap data base +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.url.description=Lizmap URL +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 b4cf1da..0a7d9cb 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 @@ -37,11 +37,13 @@ echobase.config.gis.templates.directory.description=Répertoire des templates ut echobase.config.h2Version.description=Version du pilote jdbc H2 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.config.file.description=Fichier de configuration de lizmap -echobase.config.lizmap.jdbc.url.description=URL JDBC de la base lizmap -echobase.config.lizmap.projects.directory.description=Répertoire de génération des projets lizMap -echobase.config.lizmap.template.file.description=Le modièle du fichier de configuration de Lizmap -echobase.config.lizmap.url.description=L'URL de Lizmap +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.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 echobase.config.log.config.file.description=Fichier de configuration des logs echobase.config.postgresqlVersion.description=Version du pilote jdbc Postgresql echobase.config.qgis.resources.directory.description=Répertoire des resources associées à un projet Qgis diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java index 9df16a8..6a14962 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/GisService.java @@ -173,7 +173,7 @@ public class GisService extends EchoBaseServiceSupport { public String getRepositoryUrl(JdbcConfiguration conf) { String repositoryName = getRepositoryName(conf); - String repositoryUrl = getConfiguration().getLizmapUrl() + "?" + "repository=" + repositoryName; + String repositoryUrl = getConfiguration().getLizmapApplicationUrl() + "?" + "repository=" + repositoryName; return repositoryUrl; } @@ -183,7 +183,7 @@ public class GisService extends EchoBaseServiceSupport { WorkingDbConfiguration workingDbConfiguration = workingDbConfigurationService.getWorkingDbConfigurationByUrl(conf.getUrl()); - File lizmapConfigFile = getConfiguration().getLizmapConfigFile(); + File lizmapConfigFile = getConfiguration().getLizmapApplicationConfigFile(); try { @@ -212,7 +212,7 @@ public class GisService extends EchoBaseServiceSupport { public void updateLizmapAuthorizations(String repositoryName) { - String lizmapJdbcUrl = getConfiguration().getLizmapJdbcUrl(); + String lizmapJdbcUrl = getConfiguration().getLizmapApplicationJdbcUrl(); Connection connection = null; try { diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index c58d1ff..924a116 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -223,7 +223,7 @@ public class EchoBaseApplicationContext { throw new TopiaException("Could not extract files (drivers + embedded war)", e); } - File lizmapConfig = getConfiguration().getLizmapConfigFile(); + File lizmapConfig = getConfiguration().getLizmapApplicationConfigFile(); gisSupport = lizmapConfig.exists(); diff --git a/echobase-ui/src/main/resources/echobase.properties b/echobase-ui/src/main/resources/echobase.properties index 9d3ab82..6ed8cc3 100644 --- a/echobase-ui/src/main/resources/echobase.properties +++ b/echobase-ui/src/main/resources/echobase.properties @@ -27,3 +27,6 @@ echobase.postgresqlVersion=${postgresqlVersion} # H2 pilot version echobase.h2Version=${h2Version} + +# Lizmap version +echobase.lizmap.application.version=${lizmapVersion} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.