This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 259d5dde46b123f92aa0f093274dca22206942f0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 22 11:59:58 2016 +0200 Amélioration de la documentation et du démarrage de l'application web --- .../web/configuration/ObserveWebApplicationConfiguration.java | 10 ++++------ .../src/main/resources/defaultDatabases.yml | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java index a7ddd87..26176ef 100644 --- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java +++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java @@ -152,14 +152,12 @@ public class ObserveWebApplicationConfiguration extends GeneratedObserveWebAppli File log4jConfigurationFile = getLog4jConfigurationFile(); if (!log4jConfigurationFile.exists()) { - // Generate a default log4jConfigurationFile + if (log.isInfoEnabled()) { + log.info("Generate default log4jConfigurationFile"); + } try { CharSource charSource = Resources.asCharSource(getClass().getResource("/observeweb-log4j.conf"), Charsets.UTF_8); - String log4jFileContent = charSource.read(); - if (log.isInfoEnabled()) { - log.info("Generate default log4jConfigurationFile"); - } - Files.write(log4jConfigurationFile.toPath(), log4jFileContent.getBytes()); + Files.write(log4jConfigurationFile.toPath(), charSource.readLines()); } catch (IOException e) { throw new ObserveWebApplicationConfigurationInitException("Impossible de créer un fichier de log4j", e); } diff --git a/application-web-configuration/src/main/resources/defaultDatabases.yml b/application-web-configuration/src/main/resources/defaultDatabases.yml index 860d1b2..7e40e46 100644 --- a/application-web-configuration/src/main/resources/defaultDatabases.yml +++ b/application-web-configuration/src/main/resources/defaultDatabases.yml @@ -3,14 +3,14 @@ databases: defaultDatabase: true roles: - login: technicien - password: tech + password: a - login: referentiel password: a url: jdbc:postgresql://localhost:5432/obstuna-production - name: test roles: - login: technicien - password: tech + password: a - login: referentiel password: a url: jdbc:postgresql://localhost:5432/obstuna-test \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.