branch feature/1190-encodage-path created (now d5b2b30)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1190-encodage-path in repository lima. See http://git.chorem.org/lima.git at d5b2b30 refs #1190 some fixes, work in progress This branch includes the following new commits: new d5b2b30 refs #1190 some fixes, work in progress 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 d5b2b30760928174a3c23218647ec0f2d5c95d34 Author: dcosse <cosse@codelutin.com> Date: Thu Mar 5 08:08:09 2015 +0100 refs #1190 some fixes, work in progress -- 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 feature/1190-encodage-path in repository lima. See http://git.chorem.org/lima.git commit d5b2b30760928174a3c23218647ec0f2d5c95d34 Author: dcosse <cosse@codelutin.com> Date: Thu Mar 5 08:08:09 2015 +0100 refs #1190 some fixes, work in progress --- .../java/org/chorem/lima/business/LimaServiceConfig.java | 15 ++++++++++++--- .../java/org/chorem/lima/service/LimaServiceFactory.java | 1 + .../src/main/java/org/chorem/lima/LimaSwingConfig.java | 11 ++++++++--- lima-swing/src/main/resources/lima-config.properties | 3 +++ lima-swing/src/main/resources/log4j.properties | 9 +++++---- 5 files changed, 29 insertions(+), 10 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java index b71cb65..bca00dd 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaServiceConfig.java @@ -63,7 +63,7 @@ public class LimaServiceConfig { protected static AccountingRules accountingRules; - protected static final String LIMA_DEFAULT_CONF_FILENAME = "lima.properties"; + protected static final String CONFIG_FILE_NAME = "lima.properties"; protected ApplicationConfig config; @@ -73,7 +73,7 @@ public class LimaServiceConfig { private LimaServiceConfig(String configFileName) { try { - ApplicationConfig defaultConfig = new ApplicationConfig(LIMA_DEFAULT_CONF_FILENAME); + ApplicationConfig defaultConfig = new ApplicationConfig(ServiceConfigOption.CONFIG_FILE.defaultValue); defaultConfig.loadDefaultOptions(ServiceConfigOption.values()); defaultConfig.parse(); @@ -182,6 +182,14 @@ public class LimaServiceConfig { return config.getFlatOptions(); } + public String getConfigFile() { + return config.getOption(ServiceConfigOption.CONFIG_FILE.key); + } + + public void setConfigFile(String configFile) { + LimaServiceConfig.getInstance().config.setOption(ServiceConfigOption.CONFIG_FILE.key, configFile); + } + public String getApplicationVersion() { return config.getOption(ServiceConfigOption.APPLICATION_VERSION.key); } @@ -497,7 +505,8 @@ public class LimaServiceConfig { */ public enum ServiceConfigOption implements ConfigOptionDef { -// CONFIG_FILE(CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima.properties", String.class, true, true), + CONFIG_FILE(CONFIG_FILE_NAME, n("lima.configFileName.description"), "lima.properties", String.class, true, true), + APPLICATION_VERSION("application.version", n("application.version"), null, String.class, false, false), 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), diff --git a/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java b/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java index 147db08..c16e2c5 100644 --- a/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java +++ b/lima-business/src/main/java/org/chorem/lima/service/LimaServiceFactory.java @@ -71,6 +71,7 @@ public class LimaServiceFactory { // introducing strange behaviour in AppConfig loading // only copy necessary options props.putAll(config.getOptionStartsWith("java.naming")); + props.putAll(config.getOptionStartsWith("openejb")); // transmission des options de logging a openejb // sinon, il utilise son propre pattern interne diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java index 7ef0476..befba4e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaSwingConfig.java @@ -68,7 +68,7 @@ public class LimaSwingConfig extends ApplicationConfig { private static LimaSwingConfig instance; - private static final String configFile = "lima-config.properties"; + private static final String CONFIG_FILE_NAME = "lima-config"; protected OptionsService optionsService; @@ -117,7 +117,7 @@ public class LimaSwingConfig extends ApplicationConfig { public synchronized static LimaSwingConfig getInstance() { if (instance == null) { instance = new LimaSwingConfig(); - instance.loadConfiguration(configFile); + instance.loadConfiguration(Option.CONFIG_FILE.getDefaultValue()); } return instance; } @@ -447,7 +447,7 @@ public class LimaSwingConfig extends ApplicationConfig { CONFIG_FILE(CONFIG_FILE_NAME, t("lima.config.configFileName.label"), n("lima.config.configFileName.description"), - "lima-config.properties", + "lima.properties", String.class, true, true), DATA_DIR("lima.data.dir", @@ -515,6 +515,11 @@ public class LimaSwingConfig extends ApplicationConfig { "false", String.class, false, false), + OPENEJB_EXCLUDE_INCLUDE("openejb.exclude-include.order", "open_EJB_include-exclude_order","open_EJB_include-exclude_order", "include-exclude", String.class, false, false), + OPENEJB_INCLUDE("openejb.deployments.classpath.include", "open_EJB_include","open_EJB_include", "", String.class, false, false), + OPENEJB_EXCLUDE("openejb.deployments.classpath.exclude", "open_EJB_exclude","open_EJB_exclude", ".*", String.class, false, false), + OPENEJB_LOCAL_INITIAL_CONTEXT_FACTORY("java.naming.factory.initial", "java.naming.factory.initial", "java.naming.factory.initial", "org.apache.openejb.core.LocalInitialContextFactory", String.class, false, false), + LIMA_HOST_ADDRESS("lima.host.address", t("lima.config.host.address.label"), n("lima.config.host.address.description"), diff --git a/lima-swing/src/main/resources/lima-config.properties b/lima-swing/src/main/resources/lima-config.properties index 849faf6..a317c16 100644 --- a/lima-swing/src/main/resources/lima-config.properties +++ b/lima-swing/src/main/resources/lima-config.properties @@ -44,6 +44,9 @@ application.organisation.url=${project.organization.url} # Embedded mode #lima.openejb.remotemode=false java.naming.factory.initial=org.apache.openejb.core.LocalInitialContextFactory +openejb.exclude-include.order=include-exclude +openejb.deployments.classpath.include="" +openejb.deployments.classpath.exclude=".*" #Lima Accounting Host #lima.host.address=localhost diff --git a/lima-swing/src/main/resources/log4j.properties b/lima-swing/src/main/resources/log4j.properties index 1a127e2..804ff5b 100644 --- a/lima-swing/src/main/resources/log4j.properties +++ b/lima-swing/src/main/resources/log4j.properties @@ -35,12 +35,13 @@ log4j.appender.file.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n #oepnEjb openejb.logger.external=true +log4j.category.OpenEJB.options=warn log4j.category.OpenEJB=warn -log4j.category.OpenEJB.server=info -log4j.category.OpenEJB.startup=info +log4j.category.OpenEJB.server=warn +log4j.category.OpenEJB.startup=warn log4j.category.OpenEJB.startup.service=warn -log4j.category.OpenEJB.startup.config=info -log4j.category.OpenEJB.hsql=info +log4j.category.OpenEJB.startup.config=warn +log4j.category.OpenEJB.hsql=error log4j.category.CORBA-Adapter=info log4j.category.Transaction=warn log4j.category.org.apache.activemq=error -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm