svn commit: r389896 - in /jackrabbit/branches/1.0/jcr-rmi: project.xml src/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java src/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java

[ju...@apache.org]

Author: jukka
Date: Wed Mar 29 13:43:03 2006
New Revision: 389896

URL: http://svn.apache.org/viewcvs?rev=389896&view=rev
Log:
1.0: Merged revision 389894: JCR-376 Replaced commons-logging with slf4j-log4j12 in JCR-RMI.

Modified:
    jackrabbit/branches/1.0/jcr-rmi/project.xml
    jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
    jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java

Modified: jackrabbit/branches/1.0/jcr-rmi/project.xml
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/jcr-rmi/project.xml?rev=389896&r1=389895&r2=389896&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jcr-rmi/project.xml (original)
+++ jackrabbit/branches/1.0/jcr-rmi/project.xml Wed Mar 29 13:43:03 2006
@@ -64,9 +64,16 @@
       <version>3.8.1</version>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
       <version>1.0</version>
+      <url>http://www.slf4j.org/download.html</url>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
+      <url>http://logging.apache.org/log4j</url>
     </dependency>
   </dependencies>
 

Modified: jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java?rev=389896&r1=389895&r2=389896&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java (original)
+++ jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ClientEventPoll.java Wed Mar 29 13:43:03 2006
@@ -24,11 +24,11 @@
 import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.rmi.iterator.ArrayEventIterator;
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
 import org.apache.jackrabbit.rmi.remote.RemoteObservationManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The <code>ClientEventPoll</code> class is the registry for client-side
@@ -53,7 +53,8 @@
 public class ClientEventPoll extends Thread {
 
     /** logger */
-    private static final Log log = LogFactory.getLog(ClientEventPoll.class);
+    private static final Logger log =
+        LoggerFactory.getLogger(ClientEventPoll.class);
 
     /**
      * The time in milliseconds the {@link #run()} method should be waiting

Modified: jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java?rev=389896&r1=389895&r2=389896&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java (original)
+++ jackrabbit/branches/1.0/jcr-rmi/src/java/org/apache/jackrabbit/rmi/observation/ServerEventListenerProxy.java Wed Mar 29 13:43:03 2006
@@ -20,10 +20,10 @@
 import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.rmi.remote.RemoteEventCollection;
 import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The <code>ServerEventListenerProxy</code> class is the server-side event
@@ -46,8 +46,8 @@
 public class ServerEventListenerProxy implements EventListener {
 
     /** logger */
-    private static final Log log =
-        LogFactory.getLog(ServerEventListenerProxy.class);
+    private static final Logger log =
+        LoggerFactory.getLogger(ServerEventListenerProxy.class);
 
     /** The factory used to convert event iterators to remote events */
     private final RemoteAdapterFactory factory;