activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1069405 [2/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/AdvisoryConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java Thu Feb 10 14:24:01 2011
@@ -27,11 +27,11 @@ import org.apache.activemq.command.DataS
 import org.apache.activemq.command.DestinationInfo;
 import org.apache.activemq.command.MessageAck;
 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;
 
 public class AdvisoryConsumer implements ActiveMQDispatcher {
-    private static final transient Log LOG = LogFactory.getLog(AdvisoryConsumer.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(AdvisoryConsumer.class);
 
     int deliveredCounter;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java Thu Feb 10 14:24:01 2011
@@ -42,8 +42,8 @@ import org.apache.activemq.command.XATra
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.util.JMSExceptionSupport;
 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;
 
 /**
  * A TransactionContext provides the means to control a JMS transaction. It
@@ -65,7 +65,7 @@ import org.apache.commons.logging.LogFac
  */
 public class TransactionContext implements XAResource {
 
-    private static final Log LOG = LogFactory.getLog(TransactionContext.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionContext.class);
 
     // XATransactionId -> ArrayList of TransactionContext objects
     private final static ConcurrentHashMap<TransactionId, List<TransactionContext>> ENDED_XA_TRANSACTION_CONTEXTS = new ConcurrentHashMap<TransactionId, List<TransactionContext>>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.state.Produce
 import org.apache.activemq.usage.Usage;
 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;
 
 /**
  * This broker filter handles tracking the state of the broker for purposes of
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac
  */
 public class AdvisoryBroker extends BrokerFilter {
 
-    private static final Log LOG = LogFactory.getLog(AdvisoryBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AdvisoryBroker.class);
     private static final IdGenerator ID_GENERATOR = new IdGenerator();
 
     protected final ConcurrentHashMap<ConnectionId, ConnectionInfo> connections = new ConcurrentHashMap<ConnectionId, ConnectionInfo>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.command.RemoveInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An object which can be used to listen to the number of active consumers
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class ConsumerEventSource implements Service, MessageListener {
-    private static final Log LOG = LogFactory.getLog(ConsumerEventSource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConsumerEventSource.class);
 
     private final Connection connection;
     private final ActiveMQDestination destination;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/DestinationSource.java Thu Feb 10 14:24:01 2011
@@ -35,8 +35,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQTempTopic;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.command.DestinationInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A helper class which keeps track of the Destinations available in a broker and allows you to listen to them
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class DestinationSource implements MessageListener {
-    private static final Log LOG = LogFactory.getLog(ConsumerEventSource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConsumerEventSource.class);
     private AtomicBoolean started = new AtomicBoolean(false);
     private final Connection connection;
     private Session session;
@@ -189,4 +189,4 @@ public class DestinationSource implement
             listener.onDestinationEvent(event);
         }
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.ProducerInfo;
 import org.apache.activemq.command.RemoveInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An object which can be used to listen to the number of active consumers
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 359679 $
  */
 public class ProducerEventSource implements Service, MessageListener {
-    private static final Log LOG = LogFactory.getLog(ProducerEventSource.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProducerEventSource.class);
 
     private final Connection connection;
     private final ActiveMQDestination destination;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerPluginSupport.java Thu Feb 10 14:24:01 2011
@@ -16,8 +16,8 @@
  */
 package org.apache.activemq.broker;
 
-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 broker plugins.
@@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public abstract class BrokerPluginSupport extends MutableBrokerFilter implements BrokerPlugin {
-    private static final Log LOG = LogFactory.getLog(BrokerPluginSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BrokerPluginSupport.class);
     public BrokerPluginSupport() {
         super(null);
     }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerRegistry.java Thu Feb 10 14:24:01 2011
@@ -20,15 +20,15 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.3 $
  */
 public class BrokerRegistry {
 
-    private static final Log LOG = LogFactory.getLog(BrokerRegistry.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BrokerRegistry.class);
     private static final BrokerRegistry INSTANCE = new BrokerRegistry();
 
     private final Object mutex = new Object();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java Thu Feb 10 14:24:01 2011
@@ -92,8 +92,8 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.transport.vm.VMTransportFactory;
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 /**
  * Manages the lifecycle of an ActiveMQ Broker. A BrokerService consists of a
  * number of transport connectors, network connectors and a bunch of properties
@@ -107,7 +107,7 @@ public class BrokerService implements Se
     public static final String DEFAULT_PORT = "61616";
     public static final String LOCAL_HOST_NAME;
     public static final String DEFAULT_BROKER_NAME = "localhost";
-    private static final Log LOG = LogFactory.getLog(BrokerService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BrokerService.class);
     private static final long serialVersionUID = 7353129142305630237L;
     private boolean useJmx = true;
     private boolean enableStatistics = true;
@@ -412,7 +412,7 @@ public class BrokerService implements Se
 
     public void masterFailed() {
         if (shutdownOnMasterFailure) {
-            LOG.fatal("The Master has failed ... shutting down");
+            LOG.error("The Master has failed ... shutting down");
             try {
                 stop();
             } catch (Exception e) {
@@ -893,7 +893,7 @@ public class BrokerService implements Se
             }
             return systemUsage;
         } catch (IOException e) {
-            LOG.fatal("Cannot create SystemUsage", e);
+            LOG.error("Cannot create SystemUsage", e);
             throw new RuntimeException("Fatally failed to create SystemUsage" + e.getMessage());
         }
     }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ProducerBrokerExchange.java Thu Feb 10 14:24:01 2011
@@ -20,8 +20,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.Region;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.state.ProducerState;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Holds internal state in the broker for a MessageProducer
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
  */
 public class ProducerBrokerExchange {
 
-    private static final Log LOG = LogFactory.getLog(ProducerBrokerExchange.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProducerBrokerExchange.class);
     private ConnectionContext connectionContext;
     private Destination regionDestination;
     private Region region;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java Thu Feb 10 14:24:01 2011
@@ -40,8 +40,8 @@ import org.apache.activemq.transaction.T
 import org.apache.activemq.transaction.XATransaction;
 import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.WrappedException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This broker filter handles the transaction related operations in the Broker
@@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFac
  */
 public class TransactionBroker extends BrokerFilter {
 
-    private static final Log LOG = LogFactory.getLog(TransactionBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionBroker.class);
 
     // The prepared XA transactions.
     private TransactionStore transactionStore;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java Thu Feb 10 14:24:01 2011
@@ -94,17 +94,17 @@ import org.apache.activemq.util.Introspe
 import org.apache.activemq.util.MarshallingSupport;
 import org.apache.activemq.util.ServiceSupport;
 import org.apache.activemq.util.URISupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static org.apache.activemq.thread.DefaultThreadPools.getDefaultTaskRunnerFactory;
 /**
  * @version $Revision: 1.8 $
  */
 public class TransportConnection implements Connection, Task, CommandVisitor {
-    private static final Log LOG = LogFactory.getLog(TransportConnection.class);
-    private static final Log TRANSPORTLOG = LogFactory.getLog(TransportConnection.class.getName() + ".Transport");
-    private static final Log SERVICELOG = LogFactory.getLog(TransportConnection.class.getName() + ".Service");
+    private static final Logger LOG = LoggerFactory.getLogger(TransportConnection.class);
+    private static final Logger TRANSPORTLOG = LoggerFactory.getLogger(TransportConnection.class.getName() + ".Transport");
+    private static final Logger SERVICELOG = LoggerFactory.getLogger(TransportConnection.class.getName() + ".Service");
     // Keeps track of the broker and connector that created this connection.
     protected final Broker broker;
     protected final TransportConnector connector;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java Thu Feb 10 14:24:01 2011
@@ -40,8 +40,8 @@ import org.apache.activemq.transport.dis
 import org.apache.activemq.transport.discovery.DiscoveryAgentFactory;
 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;
 
 /**
  * @org.apache.xbean.XBean
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac
  */
 public class TransportConnector implements Connector, BrokerServiceAware {
 
-    final Log LOG = LogFactory.getLog(TransportConnector.class);
+    final Logger LOG = LoggerFactory.getLogger(TransportConnector.class);
 
     protected CopyOnWriteArrayList<TransportConnection> connections = new CopyOnWriteArrayList<TransportConnection>();
     protected TransportStatusDetector statusDector;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.Atomi
 
 import org.apache.activemq.Service;
 import org.apache.activemq.ThreadPriorities;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Used to provide information on the status of the Connection
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.5 $
  */
 public class TransportStatusDetector implements Service, Runnable {
-    private static final Log LOG = LogFactory.getLog(TransportStatusDetector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransportStatusDetector.class);
     private TransportConnector connector;
     private Set<TransportConnection> collectionCandidates = new CopyOnWriteArraySet<TransportConnection>();
     private AtomicBoolean started = new AtomicBoolean(false);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/cluster/ConnectionSplitBroker.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.ActiveMQDestination;
 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;
 
 /**
  * Monitors for client connections that may fail to another broker - but this
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class ConnectionSplitBroker extends BrokerFilter{
-    private static final Log LOG = LogFactory.getLog(ConnectionSplitBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConnectionSplitBroker.class);
     private List<ConsumerInfo>networkConsumerList = new ArrayList<ConsumerInfo>();
     public ConnectionSplitBroker(Broker next) {
         super(next);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java Thu Feb 10 14:24:01 2011
@@ -48,8 +48,8 @@ import org.apache.activemq.command.Trans
 import org.apache.activemq.transport.MutexTransport;
 import org.apache.activemq.transport.ResponseCorrelator;
 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;
 
 /**
  * The Message Broker which passes messages to a slave
@@ -58,7 +58,7 @@ import org.apache.commons.logging.LogFac
  */
 public class MasterBroker extends InsertableMutableBrokerFilter {
 
-    private static final Log LOG = LogFactory.getLog(MasterBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MasterBroker.class);
     private Transport slave;
     private AtomicBoolean started = new AtomicBoolean(false);
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.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;
 
 /**
  * Connects a Slave Broker to a Master when using <a
@@ -56,7 +56,7 @@ import org.apache.commons.logging.LogFac
  */
 public class MasterConnector implements Service, BrokerServiceAware {
 
-    private static final Log LOG = LogFactory.getLog(MasterConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MasterConnector.class);
     private BrokerService broker;
     private URI remoteURI;
     private URI localURI;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AbortSlowConsumerStrategyView.java Thu Feb 10 14:24:01 2011
@@ -19,8 +19,8 @@ package org.apache.activemq.broker.jmx;
 import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.broker.region.policy.AbortSlowConsumerStrategy;
 import org.apache.activemq.broker.region.policy.SlowConsumerEntry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.management.ObjectName;
 import javax.management.openmbean.CompositeType;
@@ -31,7 +31,7 @@ import javax.management.openmbean.Tabula
 import java.util.Map;
 
 public class AbortSlowConsumerStrategyView implements AbortSlowConsumerStrategyViewMBean {
-    private static final Log LOG = LogFactory.getLog(AbortSlowConsumerStrategyView.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbortSlowConsumerStrategyView.class);
     private ManagedRegionBroker broker;
     private AbortSlowConsumerStrategy strategy;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/AnnotatedMBean.java Thu Feb 10 14:24:01 2011
@@ -17,8 +17,8 @@
 package org.apache.activemq.broker.jmx;
 
 import org.apache.activemq.broker.util.*;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -38,7 +38,7 @@ public class AnnotatedMBean extends Stan
 
   private static final Map<String, Class<?>> primitives = new HashMap<String, Class<?>>();
 
-  private static final Log LOG = LogFactory.getLog("org.apache.activemq.audit");
+  private static final Logger LOG = LoggerFactory.getLogger("org.apache.activemq.audit");
 
   private static boolean audit;
   private static AuditLogService auditLog;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationView.java Thu Feb 10 14:24:01 2011
@@ -48,11 +48,11 @@ import org.apache.activemq.command.Messa
 import org.apache.activemq.filter.BooleanExpression;
 import org.apache.activemq.filter.MessageEvaluationContext;
 import org.apache.activemq.selector.SelectorParser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DestinationView implements DestinationViewMBean {
-    private static final Log LOG = LogFactory.getLog(DestinationViewMBean.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DestinationViewMBean.class);
     protected final Destination destination;
     protected final ManagedRegionBroker broker;
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java Thu Feb 10 14:24:01 2011
@@ -71,11 +71,11 @@ import org.apache.activemq.usage.SystemU
 import org.apache.activemq.util.JMXSupport;
 import org.apache.activemq.util.ServiceStopper;
 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;
 
 public class ManagedRegionBroker extends RegionBroker {
-    private static final Log LOG = LogFactory.getLog(ManagedRegionBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ManagedRegionBroker.class);
     private final ManagementContext managementContext;
     private final ObjectName brokerObjectName;
     private final Map<ObjectName, DestinationView> topics = new ConcurrentHashMap<ObjectName, DestinationView>();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedTransportConnection.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import org.apache.activemq.thread.TaskRu
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.util.IOExceptionSupport;
 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 java.io.IOException;
 import java.util.Hashtable;
 import javax.management.ObjectName;
@@ -37,7 +37,7 @@ import javax.management.ObjectName;
  * @version $Revision: 1.1 $
  */
 public class ManagedTransportConnection extends TransportConnection {
-    private static final Log LOG = LogFactory.getLog(ManagedTransportConnection.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ManagedTransportConnection.class);
 
     private final ManagementContext managementContext;
     private final ObjectName connectorName;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java Thu Feb 10 14:24:01 2011
@@ -17,8 +17,8 @@
 package org.apache.activemq.broker.jmx;
 
 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;
 
 import javax.management.*;
 import javax.management.remote.JMXConnectorServer;
@@ -46,7 +46,7 @@ public class ManagementContext implement
      * Default activemq domain
      */
     public static final String DEFAULT_DOMAIN = "org.apache.activemq";
-    private static final Log LOG = LogFactory.getLog(ManagementContext.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ManagementContext.class);
     private MBeanServer beanServer;
     private String jmxDomainName = DEFAULT_DOMAIN;
     private boolean useMBeanServer = true;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java Thu Feb 10 14:24:01 2011
@@ -44,15 +44,15 @@ import org.apache.activemq.filter.Destin
 import org.apache.activemq.security.SecurityContext;
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.14 $
  */
 public abstract class AbstractRegion implements Region {
 
-    private static final Log LOG = LogFactory.getLog(AbstractRegion.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractRegion.class);
 
     protected final Map<ActiveMQDestination, Destination> destinations = new ConcurrentHashMap<ActiveMQDestination, Destination>();
     protected final DestinationMap destinationMap = new DestinationMap();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java Thu Feb 10 14:24:01 2011
@@ -34,12 +34,12 @@ import org.apache.activemq.filter.LogicE
 import org.apache.activemq.filter.MessageEvaluationContext;
 import org.apache.activemq.filter.NoLocalExpression;
 import org.apache.activemq.selector.SelectorParser;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractSubscription implements Subscription {
 
-    private static final Log LOG = LogFactory.getLog(AbstractSubscription.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractSubscription.class);
     protected Broker broker;
     protected ConnectionContext context;
     protected ConsumerInfo info;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractTempRegion.java Thu Feb 10 14:24:01 2011
@@ -27,14 +27,14 @@ import org.apache.activemq.broker.Connec
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
  */
 public abstract class AbstractTempRegion extends AbstractRegion {
-    private static final Log LOG = LogFactory.getLog(TempQueueRegion.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TempQueueRegion.class);
 
     private Map<CachedDestination, Destination> cachedDestinations = new HashMap<CachedDestination, Destination>();
     private final boolean doCacheTempDestinations;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java Thu Feb 10 14:24:01 2011
@@ -35,7 +35,7 @@ import org.apache.activemq.store.Message
 import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.usage.Usage;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * @version $Revision: 1.12 $
@@ -600,7 +600,7 @@ public abstract class BaseDestination im
         }
     }
 
-    protected abstract Log getLog();
+    protected abstract Logger getLog();
 
     public void setSlowConsumerStrategy(SlowConsumerStrategy slowConsumerStrategy) {
         this.slowConsumerStrategy = slowConsumerStrategy;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java Thu Feb 10 14:24:01 2011
@@ -40,12 +40,12 @@ import org.apache.activemq.usage.SystemU
 import org.apache.activemq.usage.Usage;
 import org.apache.activemq.usage.UsageListener;
 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;
 
 public class DurableTopicSubscription extends PrefetchSubscription implements UsageListener {
 
-    private static final Log LOG = LogFactory.getLog(DurableTopicSubscription.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DurableTopicSubscription.class);
     private final ConcurrentHashMap<MessageId, Integer> redeliveredMessages = new ConcurrentHashMap<MessageId, Integer>();
     private final ConcurrentHashMap<ActiveMQDestination, Destination> destinations = new ConcurrentHashMap<ActiveMQDestination, Destination>();
     private final SubscriptionKey subscriptionKey;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java Thu Feb 10 14:24:01 2011
@@ -41,8 +41,8 @@ import org.apache.activemq.command.Respo
 import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A subscription that honors the pre-fetch option of the ConsumerInfo.
@@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFac
  */
 public abstract class PrefetchSubscription extends AbstractSubscription {
 
-    private static final Log LOG = LogFactory.getLog(PrefetchSubscription.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PrefetchSubscription.class);
     protected final Scheduler scheduler;
     
     protected PendingMessageCursor pending;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java Thu Feb 10 14:24:01 2011
@@ -71,8 +71,8 @@ import org.apache.activemq.transaction.S
 import org.apache.activemq.usage.Usage;
 import org.apache.activemq.usage.UsageListener;
 import org.apache.activemq.util.BrokerSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The Queue is a List of MessageEntry objects that are dispatched to matching
@@ -81,7 +81,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.28 $
  */
 public class Queue extends BaseDestination implements Task, UsageListener {
-    protected static final Log LOG = LogFactory.getLog(Queue.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(Queue.class);
     protected final TaskRunnerFactory taskFactory;
     protected TaskRunner taskRunner;
     private final ReentrantReadWriteLock consumersLock = new ReentrantReadWriteLock();
@@ -294,7 +294,7 @@ public class Queue extends BaseDestinati
                                 try {
                                     messages.addMessageLast(message);
                                 } catch (Exception e) {
-                                    LOG.fatal("Failed to add message to cursor", e);
+                                    LOG.error("Failed to add message to cursor", e);
                                 }
                             }finally {
                                 messagesLock.writeLock().unlock();
@@ -1405,7 +1405,7 @@ public class Queue extends BaseDestinati
                         }
                     }
                 } catch (Exception e) {
-                    LOG.error(e);
+                    LOG.error(e.toString());
                 }
             }
 
@@ -2057,7 +2057,7 @@ public class Queue extends BaseDestinati
     }
 
     @Override
-    protected Log getLog() {
+    protected Logger getLog() {
         return LOG;
     }
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueDispatchSelector.java Thu Feb 10 14:24:01 2011
@@ -27,8 +27,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ConsumerId;
 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;
 
 /**
  * Queue dispatch policy that determines if a message can be sent to a subscription
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class QueueDispatchSelector extends SimpleDispatchSelector {
-    private static final Log LOG = LogFactory.getLog(QueueDispatchSelector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(QueueDispatchSelector.class);
     private Subscription exclusiveConsumer;
    
    

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java Thu Feb 10 14:24:01 2011
@@ -27,12 +27,12 @@ import org.apache.activemq.command.Consu
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageAck;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class QueueSubscription extends PrefetchSubscription implements LockOwner {
 
-    private static final Log LOG = LogFactory.getLog(QueueSubscription.class);
+    private static final Logger LOG = LoggerFactory.getLogger(QueueSubscription.class);
 
     public QueueSubscription(Broker broker, SystemUsage usageManager, ConnectionContext context, ConsumerInfo info) throws InvalidSelectorException {
         super(broker,usageManager, context, info);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Thu Feb 10 14:24:01 2011
@@ -67,8 +67,8 @@ import org.apache.activemq.util.IdGenera
 import org.apache.activemq.util.InetAddressUtil;
 import org.apache.activemq.util.LongSequenceGenerator;
 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;
 
 /**
  * Routes Broker operations to the correct messaging regions for processing.
@@ -77,7 +77,7 @@ import org.apache.commons.logging.LogFac
  */
 public class RegionBroker extends EmptyBroker {
     public static final String ORIGINAL_EXPIRATION = "originalExpiration";
-    private static final Log LOG = LogFactory.getLog(RegionBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RegionBroker.class);
     private static final IdGenerator BROKER_ID_GENERATOR = new IdGenerator();
 
     protected final DestinationStatistics destinationStatistics = new DestinationStatistics();
@@ -861,7 +861,7 @@ public class RegionBroker extends EmptyB
         try {
             return getBrokerService().getBroker();
         } catch (Exception e) {
-            LOG.fatal("Trying to get Root Broker " + e);
+            LOG.error("Trying to get Root Broker " + e);
             throw new RuntimeException("The broker from the BrokerService should not throw an exception");
         }
     }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueue.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueue.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueue.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueue.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQTempDestination;
 import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.thread.TaskRunnerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The Queue is a List of MessageEntry objects that are dispatched to matching
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.28 $
  */
 public class TempQueue extends Queue{
-    private static final Log LOG = LogFactory.getLog(TempQueue.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TempQueue.class);
     private final ActiveMQTempDestination tempDest;
    
     

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempQueueRegion.java Thu Feb 10 14:24:01 2011
@@ -26,14 +26,14 @@ import org.apache.activemq.command.Consu
 import org.apache.activemq.command.MessageDispatchNotification;
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.7 $
  */
 public class TempQueueRegion extends AbstractTempRegion {
-    private static final Log LOG = LogFactory.getLog(TempQueueRegion.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TempQueueRegion.class);
     private final BrokerService brokerService;
     
     public TempQueueRegion(RegionBroker broker, BrokerService brokerService, DestinationStatistics destinationStatistics, SystemUsage memoryManager, TaskRunnerFactory taskRunnerFactory,

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TempTopicRegion.java Thu Feb 10 14:24:01 2011
@@ -24,15 +24,15 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.thread.TaskRunnerFactory;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.7 $
  */
 public class TempTopicRegion extends AbstractTempRegion {
 
-    private static final Log LOG = LogFactory.getLog(TempTopicRegion.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TempTopicRegion.class);
 
     public TempTopicRegion(RegionBroker broker, DestinationStatistics destinationStatistics, SystemUsage memoryManager, TaskRunnerFactory taskRunnerFactory,
                            DestinationFactory destinationFactory) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java Thu Feb 10 14:24:01 2011
@@ -52,8 +52,8 @@ import org.apache.activemq.thread.TaskRu
 import org.apache.activemq.thread.Valve;
 import org.apache.activemq.transaction.Synchronization;
 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;
 
 /**
  * The Topic is a destination that sends a copy of a message to every active
@@ -62,7 +62,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.21 $
  */
 public class Topic extends BaseDestination implements Task {
-    protected static final Log LOG = LogFactory.getLog(Topic.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(Topic.class);
     private final TopicMessageStore topicStore;
     protected final CopyOnWriteArrayList<Subscription> consumers = new CopyOnWriteArrayList<Subscription>();
     protected final Valve dispatchValve = new Valve(true);
@@ -662,7 +662,7 @@ public class Topic extends BaseDestinati
     }
 
     @Override
-    protected Log getLog() {
+    protected Logger getLog() {
         return LOG;
     }
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java Thu Feb 10 14:24:01 2011
@@ -38,14 +38,14 @@ import org.apache.activemq.thread.TaskRu
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.util.LongSequenceGenerator;
 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;
 
 /**
  * @version $Revision: 1.12 $
  */
 public class TopicRegion extends AbstractRegion {
-    private static final Log LOG = LogFactory.getLog(TopicRegion.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TopicRegion.class);
     protected final ConcurrentHashMap<SubscriptionKey, DurableTopicSubscription> durableSubscriptions = new ConcurrentHashMap<SubscriptionKey, DurableTopicSubscription>();
     private final LongSequenceGenerator recoveredDurableSubIdGenerator = new LongSequenceGenerator();
     private final SessionId recoveredDurableSubSessionId = new SessionId(new ConnectionId("OFFLINE"), recoveredDurableSubIdGenerator.getNextSequenceId());

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java Thu Feb 10 14:24:01 2011
@@ -38,12 +38,12 @@ import org.apache.activemq.command.Messa
 import org.apache.activemq.command.Response;
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TopicSubscription extends AbstractSubscription {
 
-    private static final Log LOG = LogFactory.getLog(TopicSubscription.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TopicSubscription.class);
     private static final AtomicLong CURSOR_NAME_COUNTER = new AtomicLong(0);
     
     protected PendingMessageCursor matched;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java Thu Feb 10 14:24:01 2011
@@ -22,15 +22,15 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageId;
 import org.apache.activemq.store.MessageRecoveryListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *  Store based cursor
  *
  */
 public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor implements MessageRecoveryListener {
-    private static final Log LOG = LogFactory.getLog(AbstractStoreCursor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractStoreCursor.class);
     protected final Destination regionDestination;
     private final PendingList batchList;
     private Iterator<MessageReference> iterator = null;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/FilePendingMessageCursor.java Thu Feb 10 14:24:01 2011
@@ -36,8 +36,8 @@ import org.apache.activemq.usage.SystemU
 import org.apache.activemq.usage.Usage;
 import org.apache.activemq.usage.UsageListener;
 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;
 import org.apache.kahadb.util.ByteSequence;
 
 /**
@@ -47,7 +47,7 @@ import org.apache.kahadb.util.ByteSequen
  * @version $Revision$
  */
 public class FilePendingMessageCursor extends AbstractPendingMessageCursor implements UsageListener {
-    static final Log LOG = LogFactory.getLog(FilePendingMessageCursor.class);
+    static final Logger LOG = LoggerFactory.getLogger(FilePendingMessageCursor.class);
     private static final AtomicLong NAME_COUNT = new AtomicLong();
     protected Broker broker;
     private final PListStore store;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/QueueStorePrefetch.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.Message;
 import org.apache.activemq.command.MessageId;
 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;
 
 /**
  * persist pending messages pending message (messages awaiting dispatch to a
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 474985 $
  */
 class QueueStorePrefetch extends AbstractStoreCursor {
-    private static final Log LOG = LogFactory.getLog(QueueStorePrefetch.class);
+    private static final Logger LOG = LoggerFactory.getLogger(QueueStorePrefetch.class);
     private final MessageStore store;
    
     /**

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java Thu Feb 10 14:24:01 2011
@@ -30,8 +30,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.Topic;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * persist pending messages pending message (messages awaiting dispatch to a
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
  */
 public class StoreDurableSubscriberCursor extends AbstractPendingMessageCursor {
 
-    private static final Log LOG = LogFactory.getLog(StoreDurableSubscriberCursor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StoreDurableSubscriberCursor.class);
     private static final int UNKNOWN = -1;
     private final String clientId;
     private final String subscriberName;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreQueueCursor.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.Queue;
 import org.apache.activemq.command.Message;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Store based Cursor for Queues
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac
  */
 public class StoreQueueCursor extends AbstractPendingMessageCursor {
 
-    private static final Log LOG = LogFactory.getLog(StoreQueueCursor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StoreQueueCursor.class);
     private final Broker broker;
     private int pendingCount;
     private final Queue queue;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/TopicStorePrefetch.java Thu Feb 10 14:24:01 2011
@@ -23,8 +23,8 @@ import org.apache.activemq.command.Messa
 import org.apache.activemq.filter.MessageEvaluationContext;
 import org.apache.activemq.filter.NonCachedMessageEvaluationContext;
 import org.apache.activemq.store.TopicMessageStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * persist pendingCount messages pendingCount message (messages awaiting disptach
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 class TopicStorePrefetch extends AbstractStoreCursor {
-    private static final Log LOG = LogFactory.getLog(TopicStorePrefetch.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TopicStorePrefetch.class);
     private final TopicMessageStore store;
     private final String clientId;
     private final String subscriberName;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbortSlowConsumerStrategy.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.ConsumerControl;
 import org.apache.activemq.thread.Scheduler;
 import org.apache.activemq.transport.InactivityIOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Abort slow consumers when they reach the configured threshold of slowness, default is slow for 30 seconds
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
  */
 public class AbortSlowConsumerStrategy implements SlowConsumerStrategy, Runnable {
     
-    private static final Log LOG = LogFactory.getLog(AbortSlowConsumerStrategy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbortSlowConsumerStrategy.class);
 
     private String name = "AbortSlowConsumerStrategy@" + hashCode();
     private Scheduler scheduler;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/AbstractDeadLetterStrategy.java Thu Feb 10 14:24:01 2011
@@ -18,8 +18,8 @@ package org.apache.activemq.broker.regio
 
 import org.apache.activemq.ActiveMQMessageAudit;
 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 strategy for choosing which destination is used for dead letter queue
@@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 426366 $
  */
 public abstract class AbstractDeadLetterStrategy implements DeadLetterStrategy {
-    private static final Log LOG = LogFactory.getLog(AbstractDeadLetterStrategy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractDeadLetterStrategy.class);
     private boolean processNonPersistent = false;
     private boolean processExpired = true;
     private ActiveMQMessageAudit audit = new ActiveMQMessageAudit();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java Thu Feb 10 14:24:01 2011
@@ -31,8 +31,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.group.MessageGroupMapFactory;
 import org.apache.activemq.filter.DestinationMapEntry;
 import org.apache.activemq.usage.SystemUsage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents an entry in a {@link PolicyMap} for assigning policies to a
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
  */
 public class PolicyEntry extends DestinationMapEntry {
 
-    private static final Log LOG = LogFactory.getLog(PolicyEntry.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PolicyEntry.class);
     private DispatchPolicy dispatchPolicy;
     private SubscriptionRecoveryPolicy subscriptionRecoveryPolicy;
     private boolean sendAdvisoryIfNoConsumers;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/PriorityNetworkDispatchPolicy.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.ConsumerId;
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.filter.MessageEvaluationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * dispatch policy that ignores lower priority duplicate network consumers,
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  */
 public class PriorityNetworkDispatchPolicy extends SimpleDispatchPolicy {
 
-    private static final Log LOG = LogFactory.getLog(PriorityNetworkDispatchPolicy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PriorityNetworkDispatchPolicy.class);
     @Override
     public boolean dispatch(MessageReference node,
             MessageEvaluationContext msgContext,

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.command.Messa
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.command.SessionId;
 import org.apache.activemq.util.IdGenerator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This implementation of {@link SubscriptionRecoveryPolicy} will perform a user
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
  */
 public class QueryBasedSubscriptionRecoveryPolicy implements SubscriptionRecoveryPolicy {
 
-    private static final Log LOG = LogFactory.getLog(QueryBasedSubscriptionRecoveryPolicy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(QueryBasedSubscriptionRecoveryPolicy.class);
 
     private MessageQuery query;
     private final AtomicLong messageSequence = new AtomicLong(0);

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/policy/RoundRobinDispatchPolicy.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import java.util.List;
 import org.apache.activemq.broker.region.MessageReference;
 import org.apache.activemq.broker.region.Subscription;
 import org.apache.activemq.filter.MessageEvaluationContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Simple dispatch policy that sends a message to every subscription that
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class RoundRobinDispatchPolicy implements DispatchPolicy {
-    static final Log LOG = LogFactory.getLog(RoundRobinDispatchPolicy.class);
+    static final Logger LOG = LoggerFactory.getLogger(RoundRobinDispatchPolicy.class);
 
     /**
      * @param node

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/MirroredQueue.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQTopic;
 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;
 
 /**
  * Creates <a href="http://activemq.org/site/mirrored-queues.html">Mirrored
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  * @org.apache.xbean.XBean
  */
 public class MirroredQueue implements DestinationInterceptor, BrokerServiceAware {
-    private static final transient Log LOG = LogFactory.getLog(MirroredQueue.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(MirroredQueue.class);
     private String prefix = "VirtualTopic.Mirror.";
     private String postfix = "";
     private boolean copyMessage = true;
@@ -143,4 +143,4 @@ public class MirroredQueue implements De
         return new ActiveMQTopic(prefix + original.getPhysicalName() + postfix);
     }
 
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java Thu Feb 10 14:24:01 2011
@@ -31,8 +31,8 @@ import javax.jms.MessageFormatException;
 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;
 import org.apache.kahadb.index.BTreeIndex;
 import org.apache.kahadb.journal.Location;
 import org.apache.kahadb.page.Transaction;
@@ -41,7 +41,7 @@ import org.apache.kahadb.util.LongMarsha
 import org.apache.kahadb.util.VariableMarshaller;
 
 class JobSchedulerImpl extends ServiceSupport implements Runnable, JobScheduler {
-    private static final Log LOG = LogFactory.getLog(JobSchedulerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JobSchedulerImpl.class);
     final JobSchedulerStore store;
     private final AtomicBoolean running = new AtomicBoolean();
     private String name;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerStore.java Thu Feb 10 14:24:01 2011
@@ -31,8 +31,8 @@ import java.util.Map.Entry;
 import org.apache.activemq.util.IOHelper;
 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;
 import org.apache.kahadb.index.BTreeIndex;
 import org.apache.kahadb.journal.Journal;
 import org.apache.kahadb.journal.Location;
@@ -46,7 +46,7 @@ import org.apache.kahadb.util.StringMars
 import org.apache.kahadb.util.VariableMarshaller;
 
 public class JobSchedulerStore extends ServiceSupport {
-    static final Log LOG = LogFactory.getLog(JobSchedulerStore.class);
+    static final Logger LOG = LoggerFactory.getLogger(JobSchedulerStore.class);
     private static final int DATABASE_LOCKED_WAIT_DELAY = 10 * 1000;
 
     public static final int CLOSED_STATE = 1;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/SchedulerBroker.java Thu Feb 10 14:24:01 2011
@@ -37,12 +37,12 @@ import org.apache.activemq.util.IdGenera
 import org.apache.activemq.util.LongSequenceGenerator;
 import org.apache.activemq.util.TypeConversionSupport;
 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;
 import org.apache.kahadb.util.ByteSequence;
 
 public class SchedulerBroker extends BrokerFilter implements JobListener {
-    private static final Log LOG = LogFactory.getLog(SchedulerBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SchedulerBroker.class);
     private static final IdGenerator ID_GENERATOR = new IdGenerator();
     private final LongSequenceGenerator messageIdGenerator = new LongSequenceGenerator();
     private final AtomicBoolean started = new AtomicBoolean();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandAgent.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.Service;
 import org.apache.activemq.advisory.AdvisorySupport;
 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;
 
 /**
  * An agent which listens to commands on a JMS destination
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
  * @org.apache.xbean.XBean
  */
 public class CommandAgent implements Service, ExceptionListener {
-    private static final Log LOG = LogFactory.getLog(CommandAgent.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CommandAgent.class);
 
     private String brokerUrl = "vm://localhost";
     private String username;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/CommandMessageListener.java Thu Feb 10 14:24:01 2011
@@ -28,14 +28,14 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.command.ActiveMQTextMessage;
 import org.apache.activemq.util.FactoryFinder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: $
  */
 public class CommandMessageListener implements MessageListener {
-    private static final Log LOG = LogFactory.getLog(CommandMessageListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CommandMessageListener.class);
 
     private Session session;
     private MessageProducer producer;

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/util/DefaultAuditLog.java Thu Feb 10 14:24:01 2011
@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.broker.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DefaultAuditLog implements AuditLog {
 
-    private static final Log LOG = LogFactory.getLog("org.apache.activemq.audit");
+    private static final Logger LOG = LoggerFactory.getLogger("org.apache.activemq.audit");
 
     public void log(AuditLogEntry entry) {
          LOG.info(entry.toString());



Mime
View raw message