activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1069405 [3/11] - in /activemq/trunk: ./ activemq-all/ activemq-camel/ activemq-camel/src/main/java/org/apache/activemq/camel/component/ activemq-camel/src/test/java/org/apache/activemq/camel/ activemq-camel/src/test/java/org/apache/activem...
Date Thu, 10 Feb 2011 14:24:21 GMT
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/LoggingBrokerPlugin.java Thu Feb 10 14:24:01 2011
@@ -42,8 +42,8 @@ import org.apache.activemq.command.Respo
 import org.apache.activemq.command.SessionInfo;
 import org.apache.activemq.command.TransactionId;
 import org.apache.activemq.usage.Usage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple Broker intercepter which allows you to enable/disable logging.
@@ -53,7 +53,7 @@ import org.apache.commons.logging.LogFac
 
 public class LoggingBrokerPlugin extends BrokerPluginSupport {
 
-    private static final Log LOG = LogFactory.getLog(LoggingBrokerPlugin.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoggingBrokerPlugin.class);
 
     private boolean logAll = false;
     private boolean logMessageEvents = false;
@@ -78,7 +78,7 @@ public class LoggingBrokerPlugin extends
     }
 
     /**
-     * Log all Events that go through the Plugin
+     * Logger all Events that go through the Plugin
      */
     public void setLogAll(boolean logAll) {
         this.logAll = logAll;
@@ -89,7 +89,7 @@ public class LoggingBrokerPlugin extends
     }
 
     /**
-     * Log Events that are related to message processing
+     * Logger Events that are related to message processing
      */
     public void setLogMessageEvents(boolean logMessageEvents) {
         this.logMessageEvents = logMessageEvents;
@@ -100,7 +100,7 @@ public class LoggingBrokerPlugin extends
     }
 
     /**
-     * Log Events that are related to connections and sessions
+     * Logger Events that are related to connections and sessions
      */
     public void setLogConnectionEvents(boolean logConnectionEvents) {
         this.logConnectionEvents = logConnectionEvents;
@@ -111,7 +111,7 @@ public class LoggingBrokerPlugin extends
     }
 
     /**
-     * Log Events that are related to transaction processing
+     * Logger Events that are related to transaction processing
      */
     public void setLogTransactionEvents(boolean logTransactionEvents) {
         this.logTransactionEvents = logTransactionEvents;
@@ -122,7 +122,7 @@ public class LoggingBrokerPlugin extends
     }
 
     /**
-     * Log Events that are related to Consumers
+     * Logger Events that are related to Consumers
      */
     public void setLogConsumerEvents(boolean logConsumerEvents) {
         this.logConsumerEvents = logConsumerEvents;
@@ -133,7 +133,7 @@ public class LoggingBrokerPlugin extends
     }
 
     /**
-     * Log Events that are related to Producers
+     * Logger Events that are related to Producers
      */
     public void setLogProducerEvents(boolean logProducerEvents) {
         this.logProducerEvents = logProducerEvents;
@@ -144,7 +144,7 @@ public class LoggingBrokerPlugin extends
     }
 
     /**
-     * Log Events that are normally internal to the broker
+     * Logger Events that are normally internal to the broker
      */
     public void setLogInternalEvents(boolean logInternalEvents) {
         this.logInternalEvents = logInternalEvents;
@@ -558,7 +558,7 @@ public class LoggingBrokerPlugin extends
             buf.append(") Session(");
             buf.append(subs.getConsumerInfo().getConsumerId().getSessionId());
             buf.append(")");
-            LOG.info(buf);
+            LOG.info(buf.toString());
         }
         super.slowConsumer(context, destination, subs);
     }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TimeStampingBrokerPlugin.java Thu Feb 10 14:24:01 2011
@@ -19,8 +19,8 @@ package org.apache.activemq.broker.util;
 import org.apache.activemq.broker.BrokerPluginSupport;
 import org.apache.activemq.broker.ProducerBrokerExchange;
 import org.apache.activemq.command.Message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A Broker interceptor which updates a JMS Client's timestamp on the message
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class TimeStampingBrokerPlugin extends BrokerPluginSupport {
-    private static final Log LOG = LogFactory.getLog(TimeStampingBrokerPlugin.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TimeStampingBrokerPlugin.class);
     /** 
     * variable which (when non-zero) is used to override
     * the expiration date for messages that arrive with

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/TraceBrokerPathPlugin.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import java.util.Map;
 
 import org.apache.activemq.broker.BrokerPluginSupport;
 import org.apache.activemq.command.MessageDispatch;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The TraceBrokerPathPlugin can be used in a network of Brokers. Each Broker 
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
 public class TraceBrokerPathPlugin extends BrokerPluginSupport {
 
 	private String stampProperty = "BrokerPath";
-    private static final Log LOG = LogFactory.getLog(TraceBrokerPathPlugin.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TraceBrokerPathPlugin.class);
 	
 	public String getStampProperty() {
 		return stampProperty;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/UDPTraceBrokerPlugin.java Thu Feb 10 14:24:01 2011
@@ -55,8 +55,8 @@ import org.apache.activemq.util.ByteArra
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.WireFormat;
 import org.apache.activemq.wireformat.WireFormatFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A Broker interceptor which allows you to trace all operations to a UDP
@@ -67,7 +67,7 @@ import org.apache.commons.logging.LogFac
  */
 public class UDPTraceBrokerPlugin extends BrokerPluginSupport {
 
-    private static final Log LOG = LogFactory.getLog(UDPTraceBrokerPlugin.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UDPTraceBrokerPlugin.class);
     protected WireFormat wireFormat;
     protected WireFormatFactory wireFormatFactory;
     protected int maxTraceDatagramSize = 1024 * 4;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/view/DotFileInterceptorSupport.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import java.io.PrintWriter;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerFilter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Useful base class
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: $
  */
 public abstract class DotFileInterceptorSupport extends BrokerFilter {
-    private final Log log = LogFactory.getLog(DotFileInterceptorSupport.class);
+    private final Logger log = LoggerFactory.getLogger(DotFileInterceptorSupport.class);
 
     private String file;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java Thu Feb 10 14:24:01 2011
@@ -18,8 +18,8 @@ package org.apache.activemq.command;
 
 import javax.jms.JMSException;
 import org.apache.activemq.ActiveMQConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @openwire:marshaller
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFac
  */
 public abstract class ActiveMQTempDestination extends ActiveMQDestination {
 
-    private static final Log LOG = LogFactory.getLog(ActiveMQTempDestination.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQTempDestination.class);
     protected transient ActiveMQConnection connection;
     protected transient String connectionId;
     protected transient int sequenceId;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import javax.jms.JMSException;
 import org.apache.activemq.filter.BooleanExpression;
 import org.apache.activemq.filter.MessageEvaluationContext;
 import org.apache.activemq.util.JMSExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @openwire:marshaller code="91"
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
 public class NetworkBridgeFilter implements DataStructure, BooleanExpression {
 
     public static final byte DATA_STRUCTURE_TYPE = CommandTypes.NETWORK_BRIDGE_FILTER;
-    static final Log LOG = LogFactory.getLog(NetworkBridgeFilter.class);
+    static final Logger LOG = LoggerFactory.getLogger(NetworkBridgeFilter.class);
 
     private BrokerId networkBrokerId;
     private int networkTTL;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java Thu Feb 10 14:24:01 2011
@@ -24,15 +24,15 @@ import javax.jms.JMSException;
 
 import org.apache.activemq.command.Message;
 import org.apache.activemq.util.JMSExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Used to evaluate an XPath Expression in a JMS selector.
  */
 public final class XPathExpression implements BooleanExpression {
 
-    private static final Log LOG = LogFactory.getLog(XPathExpression.class);
+    private static final Logger LOG = LoggerFactory.getLogger(XPathExpression.class);
     private static final String EVALUATOR_SYSTEM_PROPERTY = "org.apache.activemq.XPathEvaluatorClassName";
     private static final String DEFAULT_EVALUATOR_CLASS_NAME = XalanXPathEvaluator.class.getName();
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/JNDIReferenceFactory.java Thu Feb 10 14:24:01 2011
@@ -27,8 +27,8 @@ import javax.naming.Reference;
 import javax.naming.StringRefAddr;
 import javax.naming.spi.ObjectFactory;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Converts objects implementing JNDIStorable into a property fields so they can
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  */
 public class JNDIReferenceFactory implements ObjectFactory {
 
-    static Log log = LogFactory.getLog(JNDIReferenceFactory.class);
+    static Logger log = LoggerFactory.getLogger(JNDIReferenceFactory.class);
 
     /**
      * This will be called by a JNDIprovider when a Reference is retrieved from

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/jndi/ReadOnlyContext.java Thu Feb 10 14:24:01 2011
@@ -37,8 +37,8 @@ import javax.naming.NotContextException;
 import javax.naming.OperationNotSupportedException;
 import javax.naming.Reference;
 import javax.naming.spi.NamingManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A read-only Context <p/> This version assumes it and all its subcontext are
@@ -62,7 +62,7 @@ import org.apache.commons.logging.LogFac
  */
 @SuppressWarnings("unchecked")
 public class ReadOnlyContext implements Context, Serializable {
-    private static final Log LOG = LogFactory.getLog(ReadOnlyContext.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReadOnlyContext.class);
     public static final String SEPARATOR = "/";
     protected static final NameParser NAME_PARSER = new NameParserImpl();
     private static final long serialVersionUID = -5754338187296859149L;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java Thu Feb 10 14:24:01 2011
@@ -30,8 +30,8 @@ import org.apache.activemq.kaha.StoreLoc
 import org.apache.activemq.kaha.impl.data.Item;
 import org.apache.activemq.kaha.impl.index.IndexItem;
 import org.apache.activemq.kaha.impl.index.IndexManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A container of roots for other Containers
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
 class IndexRootContainer {
     
     protected static final Marshaller ROOT_MARSHALLER = Store.OBJECT_MARSHALLER;
-    private static final Log LOG = LogFactory.getLog(IndexRootContainer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IndexRootContainer.class);
 
     protected IndexItem root;
     protected IndexManager indexManager;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java Thu Feb 10 14:24:01 2011
@@ -44,8 +44,8 @@ import org.apache.activemq.kaha.impl.ind
 import org.apache.activemq.kaha.impl.index.IndexManager;
 import org.apache.activemq.kaha.impl.index.RedoStoreIndexItem;
 import org.apache.activemq.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Store Implementation
@@ -64,7 +64,7 @@ public class KahaStore implements Store 
     //according to the String javadoc, all constant strings are interned so this will be the same object throughout the vm
     //and we can use it as a monitor for the lockset.
     private final static String LOCKSET_MONITOR = PROPERTY_PREFIX + ".Lock.Monitor";
-    private static final Log LOG = LogFactory.getLog(KahaStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(KahaStore.class);
 
     private final File directory;
     private final String mode;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/AsyncDataManager.java Thu Feb 10 14:24:01 2011
@@ -40,8 +40,8 @@ import org.apache.activemq.kaha.impl.asy
 import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 
@@ -73,7 +73,7 @@ public class AsyncDataManager {
     public static final int DEFAULT_CLEANUP_INTERVAL = 1000 * 30;
     public static final int PREFERED_DIFF = 1024 * 512;
 
-    private static final Log LOG = LogFactory.getLog(AsyncDataManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AsyncDataManager.class);
     protected Scheduler scheduler;
 
     protected final Map<WriteKey, WriteCommand> inflightWrites = new ConcurrentHashMap<WriteKey, WriteCommand>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/async/ReadOnlyAsyncDataManager.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import java.util.List;
 
 import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.util.ByteSequence;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An AsyncDataManager that works in read only mode against multiple data directories.
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
  */
 public class ReadOnlyAsyncDataManager extends AsyncDataManager {
     
-    private static final Log LOG = LogFactory.getLog(ReadOnlyAsyncDataManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReadOnlyAsyncDataManager.class);
     private final ArrayList<File> dirs;
 
     public ReadOnlyAsyncDataManager(final ArrayList<File> dirs) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/BaseContainerImpl.java Thu Feb 10 14:24:01 2011
@@ -30,8 +30,8 @@ import org.apache.activemq.kaha.impl.ind
 import org.apache.activemq.kaha.impl.index.IndexLinkedList;
 import org.apache.activemq.kaha.impl.index.IndexManager;
 import org.apache.activemq.kaha.impl.index.VMIndexLinkedList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of a ListContainer
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
  */
 public abstract class BaseContainerImpl {
 
-    private static final Log LOG = LogFactory.getLog(BaseContainerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BaseContainerImpl.class);
     protected IndexItem root;
     protected IndexLinkedList indexList;
     protected IndexManager indexManager;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ListContainerImpl.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.kaha.impl.Dat
 import org.apache.activemq.kaha.impl.data.Item;
 import org.apache.activemq.kaha.impl.index.IndexItem;
 import org.apache.activemq.kaha.impl.index.IndexManager;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of a ListContainer
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
  */
 public class ListContainerImpl extends BaseContainerImpl implements ListContainer {
 
-    private static final Log LOG = LogFactory.getLog(ListContainerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ListContainerImpl.class);
     protected Marshaller marshaller = Store.OBJECT_MARSHALLER;
 
     public ListContainerImpl(ContainerId id, IndexItem root, IndexManager indexManager,

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java Thu Feb 10 14:24:01 2011
@@ -40,8 +40,8 @@ import org.apache.activemq.kaha.impl.ind
 import org.apache.activemq.kaha.impl.index.VMIndex;
 import org.apache.activemq.kaha.impl.index.hash.HashIndex;
 import org.apache.activemq.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of a MapContainer
@@ -50,7 +50,7 @@ import org.apache.commons.logging.LogFac
  */
 public final class MapContainerImpl extends BaseContainerImpl implements MapContainer {
 
-    private static final Log LOG = LogFactory.getLog(MapContainerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MapContainerImpl.class);
     protected Index index;
     protected Marshaller keyMarshaller = Store.OBJECT_MARSHALLER;
     protected Marshaller valueMarshaller = Store.OBJECT_MARSHALLER;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataManagerImpl.java Thu Feb 10 14:24:01 2011
@@ -32,8 +32,8 @@ import org.apache.activemq.kaha.impl.Dat
 import org.apache.activemq.kaha.impl.index.RedoStoreIndexItem;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Manages DataFiles
@@ -47,7 +47,7 @@ public final class DataManagerImpl imple
     public static final byte REDO_ITEM_TYPE = 2;
     public static final long MAX_FILE_LENGTH = 1024 * 1024 * 32;
     
-    private static final Log LOG = LogFactory.getLog(DataManagerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DataManagerImpl.class);
     private static final String NAME_PREFIX = "data-";
     
     private final File directory;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexManager.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.activemq.kaha.impl.DataManager;
 import org.apache.activemq.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Optimized Store reader
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
 public final class IndexManager {
 
     public static final String NAME_PREFIX = "index-";
-    private static final Log LOG = LogFactory.getLog(IndexManager.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IndexManager.class);
     private final String name;
     private File directory;
     private File file;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/VMIndex.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/VMIndex.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/VMIndex.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/VMIndex.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import java.util.Map;
 import org.apache.activemq.kaha.IndexMBean;
 import org.apache.activemq.kaha.Marshaller;
 import org.apache.activemq.kaha.StoreEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Index implementation using a HashMap
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.2 $
  */
 public class VMIndex implements Index, IndexMBean {
-    private static final Log LOG = LogFactory.getLog(VMIndex.class);
+    private static final Logger LOG = LoggerFactory.getLogger(VMIndex.class);
     private IndexManager indexManager;
     private Map<Object, StoreEntry> map = new HashMap<Object, StoreEntry>();
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashIndex.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashIndex.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashIndex.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashIndex.java Thu Feb 10 14:24:01 2011
@@ -30,8 +30,8 @@ import org.apache.activemq.util.DataByte
 import org.apache.activemq.util.DataByteArrayOutputStream;
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.LRUCache;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * BTree implementation
@@ -46,7 +46,7 @@ public class HashIndex implements Index,
     public static final int DEFAULT_LOAD_FACTOR;
     private static final int LOW_WATER_MARK=1024*16;
     private static final String NAME_PREFIX = "hash-index-";
-    private static final Log LOG = LogFactory.getLog(HashIndex.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HashIndex.class);
     private final String name;
     private File directory;
     private File file;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashPage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashPage.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashPage.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/hash/HashPage.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.activemq.kaha.Marshaller;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A Page within a HashPage
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
  */
 class HashPage {
     static final int PAGE_HEADER_SIZE = 17;
-    private static final transient Log LOG = LogFactory.getLog(HashPage.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(HashPage.class);
 
     private int maximumEntries;
     private long id;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreeIndex.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreeIndex.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreeIndex.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreeIndex.java Thu Feb 10 14:24:01 2011
@@ -28,8 +28,8 @@ import org.apache.activemq.util.DataByte
 import org.apache.activemq.util.DataByteArrayOutputStream;
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.LRUCache;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * BTree implementation
@@ -41,7 +41,7 @@ public class TreeIndex implements Index 
     private static final String NAME_PREFIX = "tree-index-";
     private static final int DEFAULT_PAGE_SIZE;
     private static final int DEFAULT_KEY_SIZE;
-    private static final Log LOG = LogFactory.getLog(TreeIndex.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TreeIndex.class);
     private final String name;
     private File directory;
     private File file;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreePage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreePage.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreePage.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/tree/TreePage.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.activemq.kaha.Marshaller;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Page in a BTree
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
 class TreePage {
 
     static final int PAGE_HEADER_SIZE = 18;
-    private static final transient Log LOG = LogFactory.getLog(TreePage.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(TreePage.class);
 
     static enum Flavour {
         LESS, MORE
@@ -743,11 +743,11 @@ class TreePage {
     }
 
     protected void dump() throws IOException {
-        LOG.info(this);
+        LOG.info(this.toString());
         Set<Long> set = new HashSet<Long>();
         for (TreeEntry entry : treeEntries) {
             if (entry != null) {
-                LOG.info(entry);
+                LOG.info(entry.toString());
                 set.add(entry.getPrevPageId());
                 set.add(entry.getNextPageId());
             }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 
 import org.apache.activemq.util.IndentPrinter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Statistics for a JMS endpoint, typically a MessageProducer or MessageConsumer
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.3 $
  */
 public class JMSEndpointStatsImpl extends StatsImpl {
-    private static final Log LOG = LogFactory.getLog(JMSEndpointStatsImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JMSEndpointStatsImpl.class);
 
     protected CountStatisticImpl messageCount;
     protected CountStatisticImpl pendingMessageCount;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java Thu Feb 10 14:24:01 2011
@@ -26,12 +26,12 @@ import org.apache.activemq.thread.TaskRu
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.usage.Usage;
 import org.apache.activemq.usage.UsageListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class CacheEvictionUsageListener implements UsageListener {
 
-    private static final Log LOG = LogFactory.getLog(CacheEvictionUsageListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CacheEvictionUsageListener.class);
 
     private final List<CacheEvictor> evictors = new CopyOnWriteArrayList<CacheEvictor>();
     private final int usageHighMark;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/memory/list/SimpleMessageList.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.filter.DestinationFilter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple fixed size {@link MessageList} where there is a single, fixed size
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1 $
  */
 public class SimpleMessageList implements MessageList {
-    private static final Log LOG = LogFactory.getLog(SimpleMessageList.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleMessageList.class);
     private final LinkedList<MessageReference> list = new LinkedList<MessageReference>();
     private int maximumSize = 100 * 64 * 1024;
     private int size;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/CompositeDemandForwardingBridge.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import org.apache.activemq.command.Endpo
 import org.apache.activemq.command.NetworkBridgeFilter;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A demand forwarding bridge which works with multicast style transports where
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class CompositeDemandForwardingBridge extends DemandForwardingBridgeSupport {
-    private static final Log LOG = LogFactory.getLog(CompositeDemandForwardingBridge.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CompositeDemandForwardingBridge.class);
 
     protected final BrokerId remoteBrokerPath[] = new BrokerId[] {null};
     protected Object brokerInfoMutex = new Object();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ConduitBridge.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import org.apache.activemq.command.Consu
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.filter.DestinationFilter;
 import org.apache.activemq.transport.Transport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Consolidates subscriptions
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1 $
  */
 public class ConduitBridge extends DemandForwardingBridge {
-    private static final Log LOG = LogFactory.getLog(ConduitBridge.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConduitBridge.class);
 
     /**
      * Constructor

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridge.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import org.apache.activemq.command.Consu
 import org.apache.activemq.command.NetworkBridgeFilter;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Forwards messages from the local broker to the remote broker based on demand.
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class DemandForwardingBridge extends DemandForwardingBridgeSupport {
-    private static final Log LOG = LogFactory.getLog(DemandForwardingBridge.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DemandForwardingBridge.class);
 
     protected final BrokerId remoteBrokerPath[] = new BrokerId[] {null};
     protected Object brokerInfoMutex = new Object();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Thu Feb 10 14:24:01 2011
@@ -81,8 +81,8 @@ import org.apache.activemq.util.LongSequ
 import org.apache.activemq.util.MarshallingSupport;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A useful base class for implementing demand forwarding bridges.
@@ -90,7 +90,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public abstract class DemandForwardingBridgeSupport implements NetworkBridge, BrokerServiceAware {
-    private static final Log LOG = LogFactory.getLog(DemandForwardingBridgeSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DemandForwardingBridgeSupport.class);
     private final TaskRunnerFactory asyncTaskRunner = DefaultThreadPools.getDefaultTaskRunnerFactory();
     protected static final String DURABLE_SUB_PREFIX = "NC-DS_";
     protected final Transport localBroker;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.ConsumerInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a network bridge interface
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1 $
  */
 public class DemandSubscription {
-    private static final Log LOG = LogFactory.getLog(DemandSubscription.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DemandSubscription.class);
 
     private final ConsumerInfo remoteInfo;
     private final ConsumerInfo localInfo;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java Thu Feb 10 14:24:01 2011
@@ -37,8 +37,8 @@ import org.apache.activemq.util.ServiceS
 import org.apache.activemq.util.ServiceSupport;
 import org.apache.activemq.util.URISupport;
 import org.apache.activemq.util.URISupport.CompositeData;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.management.ObjectName;
 
@@ -50,7 +50,7 @@ import javax.management.ObjectName;
  * @version $Revision$
  */
 public class DiscoveryNetworkConnector extends NetworkConnector implements DiscoveryListener {
-    private static final Log LOG = LogFactory.getLog(DiscoveryNetworkConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DiscoveryNetworkConnector.class);
 
     private DiscoveryAgent discoveryAgent;
     

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DurableConduitBridge.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import org.apache.activemq.command.Consu
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.filter.DestinationFilter;
 import org.apache.activemq.transport.Transport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Consolidates subscriptions
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1 $
  */
 public class DurableConduitBridge extends ConduitBridge {
-    private static final Log LOG = LogFactory.getLog(DurableConduitBridge.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DurableConduitBridge.class);
 
     /**
      * Constructor

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/ForwardingBridge.java Thu Feb 10 14:24:01 2011
@@ -43,8 +43,8 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.util.IdGenerator;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Forwards all messages from the local broker to the remote broker.
@@ -56,7 +56,7 @@ import org.apache.commons.logging.LogFac
 public class ForwardingBridge implements Service {
 
     private static final IdGenerator ID_GENERATOR = new IdGenerator();
-    private static final Log LOG = LogFactory.getLog(ForwardingBridge.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ForwardingBridge.class);
 
     final AtomicLong enqueueCounter = new AtomicLong();
     final AtomicLong dequeueCounter = new AtomicLong();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java Thu Feb 10 14:24:01 2011
@@ -38,8 +38,8 @@ import javax.naming.event.ObjectChangeLi
 
 import org.apache.activemq.util.URISupport;
 import org.apache.activemq.util.URISupport.CompositeData;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * class to create dynamic network connectors listed in an directory
@@ -58,7 +58,7 @@ public class      LdapNetworkConnector
        implements NamespaceChangeListener,
                   ObjectChangeListener
 {
-   private static final Log LOG = LogFactory.getLog(LdapNetworkConnector.class);
+   private static final Logger LOG = LoggerFactory.getLogger(LdapNetworkConnector.class);
 
    // force returned entries to implement the ipHost and ipService object classes (RFC 2307)
    private static final String REQUIRED_OBJECT_CLASS_FILTER  = "(&(objectClass=ipHost)(objectClass=ipService))";

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.broker.jmx.An
 import org.apache.activemq.broker.jmx.NetworkBridgeView;
 import org.apache.activemq.broker.jmx.NetworkBridgeViewMBean;
 import org.apache.activemq.util.JMXSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
@@ -31,7 +31,7 @@ import java.util.Map;
 
 public class MBeanNetworkListener implements NetworkBridgeListener {
 
-    private static final Log LOG = LogFactory.getLog(MBeanNetworkListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MBeanNetworkListener.class);
 
     BrokerService brokerService;
     ObjectName connectorName;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java Thu Feb 10 14:24:01 2011
@@ -42,15 +42,15 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.util.JMXSupport;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ServiceSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public abstract class NetworkConnector extends NetworkBridgeConfiguration implements Service {
 
-    private static final Log LOG = LogFactory.getLog(NetworkConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NetworkConnector.class);
     protected URI localURI;
     protected ConnectionFilter connectionFilter;
     protected ConcurrentHashMap<URI, NetworkBridge> bridges = new ConcurrentHashMap<URI, NetworkBridge>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import javax.jms.MessageListener;
 import javax.jms.MessageProducer;
 import javax.naming.NamingException;
 import org.apache.activemq.Service;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A Destination bridge is used to bridge between to different JMS systems
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1.1.1 $
  */
 public abstract class DestinationBridge implements Service, MessageListener {
-    private static final Log LOG = LogFactory.getLog(DestinationBridge.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DestinationBridge.class);
     protected MessageConsumer consumer;
     protected AtomicBoolean started = new AtomicBoolean(false);
     protected JmsMesageConvertor jmsMessageConvertor;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java Thu Feb 10 14:24:01 2011
@@ -31,8 +31,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.Service;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.util.LRUCache;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jndi.JndiTemplate;
 
 /**
@@ -45,7 +45,7 @@ import org.springframework.jndi.JndiTemp
 public abstract class JmsConnector implements Service {
 
     private static int nextId;
-    private static final Log LOG = LogFactory.getLog(JmsConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsConnector.class);
     
     protected JndiTemplate jndiLocalTemplate;
     protected JndiTemplate jndiOutboundTemplate;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsQueueConnector.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import javax.jms.QueueSession;
 import javax.jms.Session;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A Bridge to other JMS Queue providers
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1.1.1 $
  */
 public class JmsQueueConnector extends JmsConnector {
-    private static final Log LOG = LogFactory.getLog(JmsQueueConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsQueueConnector.class);
     private String outboundQueueConnectionFactoryName;
     private String localConnectionFactoryName;
     private QueueConnectionFactory outboundQueueConnectionFactory;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/jms/JmsTopicConnector.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import javax.jms.TopicConnectionFactory;
 import javax.jms.TopicSession;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A Bridge to other JMS Topic providers
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1.1.1 $
  */
 public class JmsTopicConnector extends JmsConnector {
-    private static final Log LOG = LogFactory.getLog(JmsTopicConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicConnector.class);
     private String outboundTopicConnectionFactoryName;
     private String localConnectionFactoryName;
     private TopicConnectionFactory outboundTopicConnectionFactory;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBroker.java Thu Feb 10 14:24:01 2011
@@ -23,15 +23,15 @@ import org.apache.activemq.broker.Connec
 import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Filip Hanik
  * @version 1.0
  */
 public class DiscardingDLQBroker extends BrokerFilter {
-    public static Log log = LogFactory.getLog(DiscardingDLQBroker.class);
+    public static Logger log = LoggerFactory.getLogger(DiscardingDLQBroker.class);
     private boolean dropTemporaryTopics = true;
     private boolean dropTemporaryQueues = true;
     private boolean dropAll = true;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/DiscardingDLQBrokerPlugin.java Thu Feb 10 14:24:01 2011
@@ -22,8 +22,8 @@ import java.util.regex.Pattern;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPlugin;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Filip Hanik
@@ -34,7 +34,7 @@ public class DiscardingDLQBrokerPlugin i
     public DiscardingDLQBrokerPlugin() {
     }
 
-    public static Log log = LogFactory.getLog(DiscardingDLQBrokerPlugin.class);
+    public static Logger log = LoggerFactory.getLogger(DiscardingDLQBrokerPlugin.class);
     private boolean dropTemporaryTopics = true;
     private boolean dropTemporaryQueues = true;
     private boolean dropAll = true;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBroker.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.BrokerFilter;
 import org.apache.activemq.broker.ProducerBrokerExchange;
 import org.apache.activemq.command.Message;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
  * @org.apache.xbean.XBean element="forcePersistencyModeBroker"
  */
 public class ForcePersistencyModeBroker extends BrokerFilter{
-  public static Log log = LogFactory.getLog(ForcePersistencyModeBroker.class);
+  public static Logger log = LoggerFactory.getLogger(ForcePersistencyModeBroker.class);
   private boolean persistence = false;
   
   /**

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/ForcePersistencyModeBrokerPlugin.java Thu Feb 10 14:24:01 2011
@@ -19,8 +19,8 @@ package org.apache.activemq.plugin;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPlugin;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
  *  @org.apache.xbean.XBean element="forcePersistencyModeBrokerPlugin"
  */
 public class ForcePersistencyModeBrokerPlugin implements BrokerPlugin {
-  private static Log LOG = LogFactory.getLog(ForcePersistencyModeBrokerPlugin.class);
+  private static Logger LOG = LoggerFactory.getLogger(ForcePersistencyModeBrokerPlugin.class);
   private boolean persistenceFlag = false;
   
   /**

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBroker.java Thu Feb 10 14:24:01 2011
@@ -35,8 +35,8 @@ import org.apache.activemq.state.Produce
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.IdGenerator;
 import org.apache.activemq.util.LongSequenceGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.net.URI;
 import java.util.Set;
@@ -47,7 +47,7 @@ import java.util.Set;
  * 
  */
 public class StatisticsBroker extends BrokerFilter {
-    private static Log LOG = LogFactory.getLog(StatisticsBroker.class);
+    private static Logger LOG = LoggerFactory.getLogger(StatisticsBroker.class);
     static final String STATS_DESTINATION_PREFIX = "ActiveMQ.Statistics.Destination";
     static final String STATS_BROKER_PREFIX = "ActiveMQ.Statistics.Broker";
     private static final IdGenerator ID_GENERATOR = new IdGenerator();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/plugin/StatisticsBrokerPlugin.java Thu Feb 10 14:24:01 2011
@@ -18,8 +18,8 @@ package org.apache.activemq.plugin;
 
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerPlugin;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A StatisticsBrokerPlugin
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
  *
  */
 public class StatisticsBrokerPlugin implements BrokerPlugin {
-    private static Log LOG = LogFactory.getLog(StatisticsBrokerPlugin.class);
+    private static Logger LOG = LoggerFactory.getLogger(StatisticsBrokerPlugin.class);
     /** 
      * @param broker
      * @return the plug-in

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnection.java Thu Feb 10 14:24:01 2011
@@ -26,12 +26,12 @@ import org.apache.activemq.transport.Def
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceStopper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class ProxyConnection implements Service {
 
-    private static final Log LOG = LogFactory.getLog(ProxyConnection.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProxyConnection.class);
 
     private final Transport localTransport;
     private final Transport remoteTransport;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/proxy/ProxyConnector.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.transport.TransportFilter;
 import org.apache.activemq.transport.TransportServer;
 import org.apache.activemq.util.ServiceStopper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @org.apache.xbean.XBean
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
  */
 public class ProxyConnector implements Service {
 
-    private static final Log LOG = LogFactory.getLog(ProxyConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProxyConnector.class);
     private TransportServer server;
     private URI bind;
     private URI remote;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/security/LDAPAuthorizationMap.java Thu Feb 10 14:24:01 2011
@@ -36,8 +36,8 @@ import javax.naming.directory.SearchResu
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.jaas.GroupPrincipal;
 import org.apache.activemq.jaas.LDAPLoginModule;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An {@link AuthorizationMap} which uses LDAP
@@ -66,7 +66,7 @@ public class LDAPAuthorizationMap implem
     public static final String WRITE_BASE = "writeBAse";
     public static final String WRITE_ATTRIBUTE = "writeAttribute";
 
-    private static final Log LOG = LogFactory.getLog(LDAPLoginModule.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LDAPLoginModule.class);
 
     private String initialContextFactory;
     private String connectionURL;
@@ -307,7 +307,7 @@ public class LDAPAuthorizationMap implem
         try {
             context = open();
         } catch (NamingException e) {
-            LOG.error(e);
+            LOG.error(e.toString());
             return new HashSet<GroupPrincipal>();
         }
 
@@ -356,7 +356,7 @@ public class LDAPAuthorizationMap implem
             }
             return roles;
         } catch (NamingException e) {
-            LOG.error(e);
+            LOG.error(e.toString());
             return new HashSet<GroupPrincipal>();
         }
     }
@@ -400,7 +400,7 @@ public class LDAPAuthorizationMap implem
             context = new InitialDirContext(env);
 
         } catch (NamingException e) {
-            LOG.error(e);
+            LOG.error(e.toString());
             throw e;
         }
         return context;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java Thu Feb 10 14:24:01 2011
@@ -47,8 +47,8 @@ import org.apache.activemq.command.Sessi
 import org.apache.activemq.command.TransactionInfo;
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.util.IOExceptionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Tracks the state of a connection so a newly established transport can be
@@ -57,7 +57,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class ConnectionStateTracker extends CommandVisitorAdapter {
-    private static final Log LOG = LogFactory.getLog(ConnectionStateTracker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConnectionStateTracker.class);
 
     private static final Tracked TRACKED_RESPONSE_MARKER = new Tracked(null);
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java Thu Feb 10 14:24:01 2011
@@ -51,8 +51,8 @@ import org.apache.activemq.transaction.S
 import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.TransactionTemplate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A MessageStore that uses a Journal to store it's messages.
@@ -60,7 +60,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.14 $
  */
 public class AMQMessageStore extends AbstractMessageStore {
-    private static final Log LOG = LogFactory.getLog(AMQMessageStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQMessageStore.class);
     protected final AMQPersistenceAdapter peristenceAdapter;
     protected final AMQTransactionStore transactionStore;
     protected final ReferenceStore referenceStore;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java Thu Feb 10 14:24:01 2011
@@ -70,8 +70,8 @@ import org.apache.activemq.util.ByteSequ
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.wireformat.WireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -84,7 +84,7 @@ import org.apache.commons.logging.LogFac
  */
 public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener, BrokerServiceAware {
 
-    private static final Log LOG = LogFactory.getLog(AMQPersistenceAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQPersistenceAdapter.class);
     private Scheduler scheduler;
     private final ConcurrentHashMap<ActiveMQQueue, AMQMessageStore> queues = new ConcurrentHashMap<ActiveMQQueue, AMQMessageStore>();
     private final ConcurrentHashMap<ActiveMQTopic, AMQTopicMessageStore> topics = new ConcurrentHashMap<ActiveMQTopic, AMQTopicMessageStore>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQTopicMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQTopicMessageStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQTopicMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQTopicMessageStore.java Thu Feb 10 14:24:01 2011
@@ -35,8 +35,8 @@ import org.apache.activemq.store.TopicRe
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.SubscriptionKey;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A MessageStore that uses a Journal to store it's messages.
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac
  */
 public class AMQTopicMessageStore extends AMQMessageStore implements TopicMessageStore {
 
-    private static final Log LOG = LogFactory.getLog(AMQTopicMessageStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQTopicMessageStore.class);
     private TopicReferenceStore topicReferenceStore;
     public AMQTopicMessageStore(AMQPersistenceAdapter adapter,TopicReferenceStore topicReferenceStore, ActiveMQTopic destinationName) {
         super(adapter, topicReferenceStore, destinationName);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java Thu Feb 10 14:24:01 2011
@@ -20,12 +20,12 @@ import org.apache.activemq.command.Messa
 import org.apache.activemq.command.MessageId;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.MessageStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 final class RecoveryListenerAdapter implements MessageRecoveryListener {
 
-    private static final Log LOG = LogFactory.getLog(RecoveryListenerAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecoveryListenerAdapter.class);
     private final MessageStore store;
     private final MessageRecoveryListener listener;
     private int count;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DefaultDatabaseLocker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DefaultDatabaseLocker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DefaultDatabaseLocker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DefaultDatabaseLocker.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import java.sql.SQLException;
 import javax.sql.DataSource;
 
 import org.apache.activemq.util.Handler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents an exclusive lock on a database to avoid multiple brokers running
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  */
 public class DefaultDatabaseLocker implements DatabaseLocker {
     public static final long DEFAULT_LOCK_ACQUIRE_SLEEP_INTERVAL = 1000;
-    private static final Log LOG = LogFactory.getLog(DefaultDatabaseLocker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultDatabaseLocker.class);
     protected DataSource dataSource;
     protected Statements statements;
     protected long lockAcquireSleepInterval = DEFAULT_LOCK_ACQUIRE_SLEEP_INTERVAL;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java Thu Feb 10 14:24:01 2011
@@ -32,15 +32,15 @@ import org.apache.activemq.util.ByteSequ
 import org.apache.activemq.util.ByteSequenceData;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.wireformat.WireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.10 $
  */
 public class JDBCMessageStore extends AbstractMessageStore {
 
-    private static final Log LOG = LogFactory.getLog(JDBCMessageStore.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JDBCMessageStore.class);
     protected final WireFormat wireFormat;
     protected final JDBCAdapter adapter;
     protected final JDBCPersistenceAdapter persistenceAdapter;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java Thu Feb 10 14:24:01 2011
@@ -51,8 +51,8 @@ import org.apache.activemq.util.FactoryF
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.LongSequenceGenerator;
 import org.apache.activemq.wireformat.WireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link PersistenceAdapter} implementation using JDBC for persistence
@@ -69,7 +69,7 @@ import org.apache.commons.logging.LogFac
 public class JDBCPersistenceAdapter extends DataSourceSupport implements PersistenceAdapter,
     BrokerServiceAware {
 
-    private static final Log LOG = LogFactory.getLog(JDBCPersistenceAdapter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JDBCPersistenceAdapter.class);
     private static FactoryFinder adapterFactoryFinder = new FactoryFinder(
                                                                    "META-INF/services/org/apache/activemq/store/jdbc/");
     private static FactoryFinder lockFactoryFinder = new FactoryFinder(



Mime
View raw message