You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/05/19 19:33:26 UTC
svn commit: r1595970 -
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
Author: rmannibucau
Date: Mon May 19 17:33:26 2014
New Revision: 1595970
URL: http://svn.apache.org/r1595970
Log:
TOMEE-1214 supporting log4j.properties then log4j.xml if logging.properties is not found
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1595970&r1=1595969&r2=1595970&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java Mon May 19 17:33:26 2014
@@ -20,6 +20,7 @@ package org.apache.openejb.util;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.SimpleLayout;
+import org.apache.log4j.xml.DOMConfigurator;
import org.apache.openejb.loader.FileUtils;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
@@ -88,8 +89,19 @@ public class Log4jLogStreamFactory imple
preprocessProperties(properties);
PropertyConfigurator.configure(properties);
} else {
- // install our logging.properties file into the conf dir
- installLoggingPropertiesFile(loggingPropertiesFile);
+ final File log4jProperties = new File(confDir, "log4j.properties");
+ if (log4jProperties.exists()) {
+ PropertyConfigurator.configure(log4jProperties.toURI().toURL());
+ } else {
+ final File log4jXml = new File(confDir, "log4j.xml");
+ if (log4jXml.exists()) {
+ DOMConfigurator.configure(log4jXml.toURI().toURL());
+ } else {
+
+ // install our logging.properties file into the conf dir
+ installLoggingPropertiesFile(loggingPropertiesFile);
+ }
+ }
}
} else {
// Embedded and no logging.properties so configure log4j directly