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 2011/12/24 19:07:08 UTC
svn commit: r1223002 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Author: rmannibucau
Date: Sat Dec 24 18:07:08 2011
New Revision: 1223002
URL: http://svn.apache.org/viewvc?rev=1223002&view=rev
Log:
avoiding to create loggin conf if in karaf
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1223002&r1=1223001&r2=1223002&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Sat Dec 24 18:07:08 2011
@@ -78,9 +78,11 @@ public class JuliLogStreamFactory implem
}
}
}
- } else {
+ } else if (System.getProperty("karaf.home") == null) {
// install our logging.properties file into the conf dir
installLoggingPropertiesFile(loggingPropertiesFile);
+ } else {
+ configureEmbedded();
}
} else {
// no conf directory, so we assume we are embedded