Remove commons-logging. Logging is now using slf4j.

git-svn-id: http://svn.jboss.org/repos/jbossas/projects/interceptors/trunk@95082 84be2c1e-ba19-0410-b317-a758671a6fc1
jbossinterceptors · Oct 19, 2009 · c9d799f · c9d799f
1 parent 57c6b9a
commit c9d799f
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 25 deletions.
diff --git a/jboss-interceptor/pom.xml b/jboss-interceptor/pom.xml
@@ -17,11 +17,25 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.jboss.interceptor</groupId>
       <artifactId>jboss-interceptor-api</artifactId>
       <optional>true</optional>
     </dependency>
+
+     <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+     </dependency>
+
+     <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <optional>true</optional>
+     </dependency>
+
+
     <dependency>
       <groupId>javassist</groupId>
       <artifactId>javassist</artifactId>
@@ -33,11 +47,6 @@
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/jboss-interceptor/src/main/java/org/jboss/interceptor/model/InterceptionTypeRegistry.java b/jboss-interceptor/src/main/java/org/jboss/interceptor/model/InterceptionTypeRegistry.java
@@ -17,23 +17,23 @@
 
 package org.jboss.interceptor.model;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
 import java.lang.annotation.Annotation;
 
 import org.jboss.interceptor.util.ReflectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a>
  */
 public final class InterceptionTypeRegistry
 {
 
-   private static final Log LOG = LogFactory.getLog(InterceptionTypeRegistry.class);
+   private static final Logger LOG = LoggerFactory.getLogger(InterceptionTypeRegistry.class);
    private static Map<InterceptionType, Class<? extends Annotation>> interceptionAnnotationClasses;
 
    static

diff --git a/...s-interceptor/src/main/java/org/jboss/interceptor/model/InterceptorClassMetadataImpl.java b/...s-interceptor/src/main/java/org/jboss/interceptor/model/InterceptorClassMetadataImpl.java
@@ -17,25 +17,31 @@
 
 package org.jboss.interceptor.model;
 
+import java.lang.reflect.Method;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import org.jboss.interceptor.util.InterceptionUtils;
 import org.jboss.interceptor.util.ReflectionUtils;
 import org.jboss.interceptor.registry.InterceptorClassMetadataRegistry;
 import org.jboss.interceptor.InterceptorException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.lang.reflect.Method;
-import java.util.*;
-import java.io.Serializable;
 
 /**
  * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a>
  */
 public class InterceptorClassMetadataImpl implements InterceptorClassMetadata, Serializable
 {
 
-   private Log log = LogFactory.getLog(InterceptorClassMetadataImpl.class);
+   private Logger log = LoggerFactory.getLogger(InterceptorClassMetadataImpl.class);
 
    private Class<?> interceptorClass;
 

diff --git a/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptionChain.java b/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/InterceptionChain.java
@@ -17,23 +17,23 @@
 
 package org.jboss.interceptor.proxy;
 
-import org.jboss.interceptor.model.InterceptionType;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import javax.interceptor.InvocationContext;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
-import java.util.Map;
+
+import org.jboss.interceptor.model.InterceptionType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author <a href="mailto:mariusb@redhat.com">Marius Bogoevici</a>
  */
 public class InterceptionChain<I>
 {
 
-   private final Log log = LogFactory.getLog(InterceptionChain.class);
+   private final Logger log = LoggerFactory.getLogger(InterceptionChain.class);
 
    private Object target;
 

diff --git a/jboss-interceptor/src/main/java/org/jboss/interceptor/util/InterceptionUtils.java b/jboss-interceptor/src/main/java/org/jboss/interceptor/util/InterceptionUtils.java
@@ -26,8 +26,8 @@
 import org.jboss.interceptor.registry.InterceptorRegistry;
 import org.jboss.interceptor.InterceptorException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.interceptor.InvocationContext;
 
@@ -42,7 +42,7 @@
  */
 public class InterceptionUtils
 {
-   private static final Log LOG = LogFactory.getLog(InterceptionUtils.class);
+   private static final Logger LOG = LoggerFactory.getLogger(InterceptionUtils.class);
    public static final String POST_CONSTRUCT = "lifecycle_mixin_$$_postConstruct";
    public static final String PRE_DESTROY = "lifecycle_mixin_$$_preDestroy";
 

diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,8 @@
   <properties>
     <version.interceptor.api>3.1.0-SNAPSHOT</version.interceptor.api>
     <version.javassist>3.11.0.GA</version.javassist>
-    <version.junit>4.5</version.junit>
+     <version.junit>4.5</version.junit>
+     <version.slf4j>1.5.6</version.slf4j>
   </properties>
 
   <modules>
@@ -200,6 +201,27 @@
         <version>${version.javassist}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${version.slf4j}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-ext</artifactId>
+        <version>${version.slf4j}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${version.slf4j}</version>
+        <scope>test</scope>
+        <optional>true</optional>
+      </dependency>
+
+
     </dependencies>
   </dependencyManagement>