[jbpm-commits] JBoss JBPM SVN: r6619 - in jbpm4/trunk/modules/log: src/main/java/org/jbpm/internal/log and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sun Aug 22 00:28:49 EDT 2010
Author: rebody
Date: 2010-08-22 00:28:46 -0400 (Sun, 22 Aug 2010)
New Revision: 6619
Added:
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLog.java
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLogFactory.java
Modified:
jbpm4/trunk/modules/log/pom.xml
jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
Log:
JBPM-2530 support slf4j.
Modified: jbpm4/trunk/modules/log/pom.xml
===================================================================
--- jbpm4/trunk/modules/log/pom.xml 2010-08-21 18:14:12 UTC (rev 6618)
+++ jbpm4/trunk/modules/log/pom.xml 2010-08-22 04:28:46 UTC (rev 6619)
@@ -33,5 +33,10 @@
<artifactId>log4j</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java 2010-08-21 18:14:12 UTC (rev 6618)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Log.java 2010-08-22 04:28:46 UTC (rev 6619)
@@ -26,25 +26,29 @@
* @author Tom Baeyens
*/
public abstract class Log {
-
+
static LogFactory logFactory;
public static synchronized Log getLog(String name) {
if (logFactory==null) {
-
+
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
// if logging.properties is available on the classpath
if (classLoader.getResource("logging.properties")!=null) {
logFactory = new Jdk14LogFactory();
-
+
+ // if slf4j is available on the classpath
+ } else if (isSlf4jAvailable(classLoader)) {
+ logFactory = new Slf4jLogFactory();
+
// if log4j is available on the classpath
} else if (isLog4jAvailable(classLoader)) {
logFactory = new Log4jLogFactory();
-
+
} else {
logFactory = new Jdk14LogFactory();
-
+
}
}
return logFactory.getLog(name);
@@ -59,7 +63,16 @@
}
}
+ static boolean isSlf4jAvailable(ClassLoader classLoader) {
+ try {
+ Class.forName("org.slf4j.impl.StaticLoggerBinder", false, classLoader);
+ return true;
+ } catch (ClassNotFoundException e) {
+ return false;
+ }
+ }
+
public abstract void error(String msg);
public abstract void error(String msg, Throwable exception);
@@ -74,9 +87,9 @@
public abstract boolean isTraceEnabled();
public abstract void trace(String msg);
public abstract void trace(String msg, Throwable exception);
-
+
public abstract boolean isWarnEnabled();
public abstract void warn(String msg);
public abstract void warn(String msg, Throwable exception);
-
+
}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLog.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLog.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLog.java 2010-08-22 04:28:46 UTC (rev 6619)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+import org.slf4j.Logger;
+
+/**
+ * @author Huisheng Xu
+ */
+public class Slf4jLog extends Log {
+
+ Logger log;
+
+ public Slf4jLog(Logger log) {
+ this.log = log;
+ }
+
+ public void error(String msg) {
+ log.error(msg);
+ }
+
+ public void error(String msg, Throwable exception) {
+ log.error(msg, exception);
+ }
+
+ public boolean isInfoEnabled() {
+ return log.isInfoEnabled();
+ }
+
+ public void info(String msg) {
+ log.info(msg);
+ }
+
+ public void info(String msg, Throwable exception) {
+ log.info(msg, exception);
+ }
+
+ public boolean isDebugEnabled() {
+ return log.isDebugEnabled();
+ }
+
+ public void debug(String msg) {
+ log.debug(msg);
+ }
+
+ public void debug(String msg, Throwable exception) {
+ log.debug(msg, exception);
+ }
+
+ public boolean isTraceEnabled() {
+ return log.isTraceEnabled();
+ }
+
+ public void trace(String msg) {
+ log.trace(msg);
+ }
+
+ public void trace(String msg, Throwable exception) {
+ log.trace(msg, exception);
+ }
+
+ public boolean isWarnEnabled() {
+ return log.isWarnEnabled();
+ }
+
+ public void warn(String msg) {
+ log.warn(msg);
+ }
+
+ public void warn(String msg, Throwable exception) {
+ log.warn(msg, exception);
+ }
+
+}
Added: jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLogFactory.java
===================================================================
--- jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLogFactory.java (rev 0)
+++ jbpm4/trunk/modules/log/src/main/java/org/jbpm/internal/log/Slf4jLogFactory.java 2010-08-22 04:28:46 UTC (rev 6619)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.internal.log;
+
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author Huisheng Xu
+ */
+public class Slf4jLogFactory implements LogFactory {
+
+ public Log getLog(String name) {
+ return new Slf4jLog(LoggerFactory.getLogger(name));
+ }
+
+}
More information about the jbpm-commits
mailing list