This is an automated email from the git hooks/post-receive script. New commit to branch feature/1198-first-lauch-exception in repository lima. See http://git.chorem.org/lima.git commit b9b6b573701b61320246248a20fd2c1f91cfb213 Author: dcosse <cosse@codelutin.com> Date: Thu Mar 12 23:29:54 2015 +0100 refs #1198 properties file rename lima.properties -> lima-config.properties --- .../src/main/java/org/chorem/lima/business/LimaBusinessConfig.java | 2 +- .../src/main/resources/{lima.properties => lima-config.properties} | 0 .../src/test/java/org/chorem/lima/business/AbstractLimaTest.java | 2 +- lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java index f255180..7a54cce 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java @@ -509,7 +509,7 @@ public class LimaBusinessConfig { DATA_DIR("lima.data.dir", n("lima.config.data.dir.description"), "${user.home}/.lima", File.class, false, false), RULES_NATIONALTY("lima.rules", n("lima.config.rulesnationality.description"), FranceAccountingRules.class.getName(), String.class, false, false), HTTP_PORT("lima.httpport", n("lima.config.httpport.description"), "5462", String.class, false, false), - SERVER_ADRESS("lima.serveraddress", n("lima.config.serveraddress.description"), "", String.class, false, false), + SERVER_ADRESS("lima.serveraddress", n("lima.config.serveraddress.description"), "localhost", String.class, false, false), VAT_PDF_URL("lima.report.vatpdfurl", n("lima.config.reportvatpdfurl.description"), "default", String.class, false, false), REPORTS_MODEL_DIR("lima.reports.dir",n("lima.config.reports.dir.description"),"${lima.data.dir}/reports", File.class, false, false), diff --git a/lima-business/src/main/resources/lima.properties b/lima-business/src/main/resources/lima-config.properties similarity index 100% rename from lima-business/src/main/resources/lima.properties rename to lima-business/src/main/resources/lima-config.properties diff --git a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java index 0578446..702c605 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java +++ b/lima-business/src/test/java/org/chorem/lima/business/AbstractLimaTest.java @@ -156,7 +156,7 @@ public abstract class AbstractLimaTest { protected Properties getTestConfiguration() { // do not call parse() method (don't read /etc...) - // load file manually (lima.properties) + // load file manually (lima-config.properties) Properties testProperties = new Properties(); // override somes String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); diff --git a/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java b/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java index eba32f9..33f58a5 100644 --- a/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java +++ b/lima-swing/src/test/java/org/chorem/lima/ui/AbstractLimaTest.java @@ -145,7 +145,7 @@ public abstract class AbstractLimaTest { protected Properties getTestConfiguration() { // do not call parse() method (don't read /etc...) - // load file manually (lima.properties) + // load file manually (lima-config.properties) Properties testProperties = new Properties(); // override somes String testDir = System.getProperty("java.io.tmpdir") + File.separator + "lima-business-" + UUID.randomUUID().toString(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.