[pollen] branch develop updated (86b2cf6 -> 06e071c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 86b2cf6 fixes #1100 error on load edit user profile page new 06e071c fixes #1102: Improve service configuration 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 06e071c74246d60239c4cca17bcc0d2bd39a9ce2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 30 13:51:39 2014 +0200 fixes #1102: Improve service configuration Summary of changes: pollen-rest-api/src/main/resources/pollen-rest-api.properties | 1 - .../org/chorem/pollen/services/config/PollenServiceConfig.java | 9 ++------- .../chorem/pollen/services/config/PollenServiceConfigOption.java | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 06e071c74246d60239c4cca17bcc0d2bd39a9ce2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 30 13:51:39 2014 +0200 fixes #1102: Improve service configuration --- pollen-rest-api/src/main/resources/pollen-rest-api.properties | 1 - .../org/chorem/pollen/services/config/PollenServiceConfig.java | 9 ++------- .../chorem/pollen/services/config/PollenServiceConfigOption.java | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pollen-rest-api/src/main/resources/pollen-rest-api.properties b/pollen-rest-api/src/main/resources/pollen-rest-api.properties index eb2a93c..80bb25e 100644 --- a/pollen-rest-api/src/main/resources/pollen-rest-api.properties +++ b/pollen-rest-api/src/main/resources/pollen-rest-api.properties @@ -25,4 +25,3 @@ hibernate.connection.password=sa hibernate.connection.driver_class=org.h2.Driver hibernate.hbm2ddl.auto=update pollen.version=${project.version} -pollen.ui.host=http://localhost \ No newline at end of file diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java index f1f6e78..693cd18 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java @@ -34,8 +34,6 @@ import org.chorem.pollen.persistence.entity.CommentVisibility; import org.chorem.pollen.persistence.entity.PollType; import org.chorem.pollen.persistence.entity.ResultVisibility; import org.chorem.pollen.persistence.entity.VoteVisibility; -import org.chorem.pollen.services.PollenApplicationContext; -import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.PollenTechnicalException; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; @@ -59,10 +57,6 @@ public class PollenServiceConfig { protected ApplicationConfig applicationConfig; - public PollenServiceConfig() { - this("pollen.properties", null); - } - public PollenServiceConfig(String filename) { this(filename, null); } @@ -70,6 +64,7 @@ public class PollenServiceConfig { public PollenServiceConfig(String filename, Properties defaultValues) { applicationConfig = new ApplicationConfig(); applicationConfig.loadDefaultOptions(PollenServiceConfigOption.values()); + applicationConfig.setAppName("pollen"); applicationConfig.setConfigFileName(filename); if (defaultValues != null) { for (Map.Entry<Object, Object> entry : defaultValues.entrySet()) { @@ -253,7 +248,7 @@ public class PollenServiceConfig { return applicationConfig.getOption(PollenServiceConfigOption.URL_USER_VALIDATE.key); } - public String getPollenUrl () { + public String getPollenUrl() { return applicationConfig.getOption(PollenServiceConfigOption.UI_HOST.key); } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java index 2517572..e6cf0d2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfigOption.java @@ -209,7 +209,7 @@ public enum PollenServiceConfigOption implements ConfigOptionDef { "true", Boolean.class), LOG_CONFIGURATION_FILE( - "logConfigurationFile", + "pollen.logConfigurationFile", "Chemin vers le fichier de configuration des journaux", null, String.class), -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm