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 2012/01/23 16:54:15 UTC
svn commit: r1234863 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
osgi/apache-karafee/src/main/filtered-resources/etc/system.properties
Author: rmannibucau
Date: Mon Jan 23 15:54:14 2012
New Revision: 1234863
URL: http://svn.apache.org/viewvc?rev=1234863&view=rev
Log:
OPENEJB-1756 using pax logger for apache karafee
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/system.properties
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1234863&r1=1234862&r2=1234863&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Mon Jan 23 15:54:14 2012
@@ -40,6 +40,8 @@ public class Logger {
} else if ("log4j".equalsIgnoreCase(factoryName)) {
// don't use .class to avoid to force loading since log4j is not mandatory
factoryName = "org.apache.openejb.util.Log4jLogStreamFactory";
+ } else if ("pax".equalsIgnoreCase(factoryName)) {
+ factoryName = "org.apache.openejb.util.PaxLogStreamFactory";
}
if (factoryName != null) {
Modified: openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/system.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/system.properties?rev=1234863&r1=1234862&r2=1234863&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/system.properties (original)
+++ openejb/trunk/openejb/osgi/apache-karafee/src/main/filtered-resources/etc/system.properties Mon Jan 23 15:54:14 2012
@@ -71,3 +71,12 @@ org.osgi.service.http.port=8181
# Allow usage of ${custom.home} as an alias for ${karaf.home}
#
custom.home=${karaf.home}
+
+#
+# openejb log configuration
+#
+# use karaf conf
+openejb.logger.external=true
+# use log4j logger, pax is an adapted version of openejb log4j logger for pax logging
+openejb.log.factory=pax
+