Merged revisions 547178 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r547178 | gsim | 2007-06-14 09:51:39 +0100 (Thu, 14 Jun 2007) | 3 lines
  
  Converted templates to generate classes using slf4j rather than log4j inline with changes applied in rev 546190.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@547731 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 4 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java b/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
index 08b5745b19..5bd7b9aea0 100644
--- a/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
+++ b/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
@@ -1,11 +1,13 @@
 package org.apache.qpid.util.concurrent;

 

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+

 import java.util.*;

 import java.util.concurrent.TimeUnit;

 import java.util.concurrent.locks.Condition;

 import java.util.concurrent.locks.ReentrantLock;

 

-import org.apache.log4j.Logger;

 

 /**

  * Synchronous/Asynchronous puts. Asynchronous is easiest, just wait till can write to queue and deposit data.

@@ -41,7 +43,8 @@ import org.apache.log4j.Logger;
 public abstract class BatchSynchQueueBase<E> extends AbstractQueue<E> implements BatchSynchQueue<E>

 {

     /** Used for logging. */

-    private static final Logger log = Logger.getLogger(BatchSynchQueueBase.class);

+    private static final Logger log = LoggerFactory.getLogger(BatchSynchQueueBase.class);

+                                                       

 

     /** Holds a reference to the queue implementation that holds the buffer. */

     Queue<SynchRecordImpl<E>> buffer;

diff --git a/java/common/templates/model/MethodRegistryClass.tmpl b/java/common/templates/model/MethodRegistryClass.tmpl
index 388a1a936f..82a385f20c 100644
--- a/java/common/templates/model/MethodRegistryClass.tmpl
+++ b/java/common/templates/model/MethodRegistryClass.tmpl
@@ -29,7 +29,8 @@
 package org.apache.qpid.framing;
 
 import java.util.HashMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.mina.common.ByteBuffer;
 
 public class MainRegistry
@@ -37,7 +38,8 @@ public class MainRegistry
 	private static final HashMap<Long, AMQMethodBodyInstanceFactory> classIDMethodIDVersionBodyMap = new HashMap<Long, AMQMethodBodyInstanceFactory>();
 
 	
-    private static final Logger _log = Logger.getLogger(MainRegistry.class);
+	private static final Logger _log = LoggerFactory.getLogger(MainRegistry.class);
+
 	
 
     private static final int DEFAULT_MINOR_VERSION_COUNT = 10;