You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/12/06 05:31:09 UTC

svn commit: r887634 - in /ibatis/java/ibatis-3/trunk/ibatis-3-core: pom.xml src/main/java/org/apache/ibatis/logging/LogFactory.java src/main/java/org/apache/ibatis/logging/slf4j/ src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java

Author: cbegin
Date: Sun Dec  6 04:31:08 2009
New Revision: 887634

URL: http://svn.apache.org/viewvc?rev=887634&view=rev
Log:
ibatis-678 Support SLF4J as logging backend

Added:
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/slf4j/
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
Modified:
    ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml
    ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java

Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml?rev=887634&r1=887633&r2=887634&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/pom.xml Sun Dec  6 04:31:08 2009
@@ -64,6 +64,18 @@
   </build>
   <dependencies>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.5.8</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.5.8</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <version>1.2.13</version>

Modified: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java?rev=887634&r1=887633&r2=887634&view=diff
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java (original)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogFactory.java Sun Dec  6 04:31:08 2009
@@ -11,6 +11,11 @@
   static {
     tryImplementation(new Runnable() {
       public void run() {
+        useSlf4jLogging();
+      }
+    });
+    tryImplementation(new Runnable() {
+      public void run() {
         useCommonsLogging();
       }
     });
@@ -39,6 +44,10 @@
     }
   }
 
+  public static synchronized void useSlf4jLogging() {
+    setImplementation("org.slf4j.LoggerFactory", "org.apache.ibatis.logging.slf4j.Slf4jImpl");
+  }
+
   public static synchronized void useCommonsLogging() {
     setImplementation("org.apache.commons.logging.LogFactory", "org.apache.ibatis.logging.commons.JakartaCommonsLoggingImpl");
   }

Added: ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java
URL: http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java?rev=887634&view=auto
==============================================================================
--- ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java (added)
+++ ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/slf4j/Slf4jImpl.java Sun Dec  6 04:31:08 2009
@@ -0,0 +1,36 @@
+package org.apache.ibatis.logging.slf4j;
+
+import org.apache.ibatis.logging.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Slf4jImpl implements Log {
+
+  private Logger log;
+
+  public Slf4jImpl(Class clazz) {
+    log = LoggerFactory.getLogger(clazz);
+  }
+
+  public boolean isDebugEnabled() {
+    return log.isDebugEnabled();
+  }
+
+  public void error(String s, Throwable e) {
+    log.error(s, e);
+  }
+
+  public void error(String s) {
+    log.error(s);
+  }
+
+  public void debug(String s) {
+    log.debug(s);
+  }
+
+  public void warn(String s) {
+    log.warn(s);
+  }
+
+
+}