qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r547731 - in /incubator/qpid/trunk/qpid: ./ gentools/templ.java/PropertyContentHeaderClass.tmpl java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java java/common/templates/model/MethodRegistryClass.tmpl
Date Fri, 15 Jun 2007 16:37:13 GMT
Author: ritchiem
Date: Fri Jun 15 09:37:08 2007
New Revision: 547731

URL: http://svn.apache.org/viewvc?view=rev&rev=547731
Log:
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.
........

Modified:
    incubator/qpid/trunk/qpid/   (props changed)
    incubator/qpid/trunk/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
    incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
    incubator/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.tmpl

Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/qpid/trunk/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl?view=diff&rev=547731&r1=547730&r2=547731
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl (original)
+++ incubator/qpid/trunk/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl Fri Jun
15 09:37:08 2007
@@ -28,12 +28,13 @@
  
 package org.apache.qpid.framing;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.mina.common.ByteBuffer;
 
 public class ${CLASS}ContentHeaderProperties implements ContentHeaderProperties
 {
-    private static final Logger logger = Logger.getLogger(BasicContentHeaderProperties.class);
+    private static final Logger logger = LoggerFactory.getLogger(BasicContentHeaderProperties.class);
 
     /**
      * We store the encoded form when we decode the content header so that if we need to

Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java?view=diff&rev=547731&r1=547730&r2=547731
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
(original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/util/concurrent/BatchSynchQueueBase.java
Fri Jun 15 09:37:08 2007
@@ -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 @@
 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;

Modified: incubator/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.tmpl
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.tmpl?view=diff&rev=547731&r1=547730&r2=547731
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.tmpl (original)
+++ incubator/qpid/trunk/qpid/java/common/templates/model/MethodRegistryClass.tmpl Fri Jun
15 09:37:08 2007
@@ -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 @@
 	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;



Mime
View raw message