activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1029743 [2/3] - in /activemq/activemq-apollo/trunk: apollo-bdb/ apollo-broker/src/main/scala/org/apache/activemq/apollo/broker/jaxb/ apollo-cassandra/ apollo-selector/ apollo-selector/src/main/java/org/apache/activemq/apollo/filter/ apollo...
Date Mon, 01 Nov 2010 16:54:12 GMT
Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/discovery/DiscoveryTransportNoBrokerTest.java Mon Nov  1 16:54:07 2010
@@ -21,12 +21,12 @@ import javax.jms.JMSException;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.apollo.CombinationTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DiscoveryTransportNoBrokerTest extends CombinationTestSupport {
 
-    private static final Log LOG = LogFactory.getLog(DiscoveryTransportNoBrokerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DiscoveryTransportNoBrokerTest.class);
     
     public void testMaxReconnectAttempts() throws JMSException {
         try {

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/BadConnectionTest.java Mon Nov  1 16:54:07 2010
@@ -24,15 +24,15 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.transport.Transport;
 import org.apache.activemq.transport.TransportFactory;
 import org.apache.activemq.transport.TransportListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1 $
  */
 public class BadConnectionTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(BadConnectionTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BadConnectionTest.class);
 
     protected Transport transport;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/failover/ReconnectTest.java Mon Nov  1 16:54:07 2010
@@ -40,8 +40,8 @@ import org.apache.activemq.transport.moc
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.apollo.transport.TransportListener;
 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;
 
 /**
  * @version $Revision: 1.1 $
@@ -51,7 +51,7 @@ public class ReconnectTest extends TestC
     public static final int MESSAGES_PER_ITTERATION = 10;
     public static final int WORKER_COUNT = 10;
 
-    private static final Log LOG = LogFactory.getLog(ReconnectTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReconnectTest.class);
 
     private BrokerService bs;
     private URI tcpUri;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/peer/PeerTransportTest.java Mon Nov  1 16:54:07 2010
@@ -36,8 +36,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.command.ConsumerInfo;
 import org.apache.activemq.util.MessageIdList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1.1.1 $
@@ -45,7 +45,7 @@ import org.apache.commons.logging.LogFac
 public class PeerTransportTest extends TestCase {
     protected static final int MESSAGE_COUNT = 50;
     protected static final int NUMBER_IN_CLUSTER = 3;
-    private static final Log LOG = LogFactory.getLog(PeerTransportTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PeerTransportTest.class);
     
     protected ActiveMQDestination destination;
     protected boolean topic = true;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/InactivityMonitorTest.java Mon Nov  1 16:54:07 2010
@@ -33,11 +33,11 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.transport.TransportServer;
 import org.apache.activemq.apollo.transport.tcp.TcpTransport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class InactivityMonitorTest extends CombinationTestSupport implements TransportAcceptListener {
-    private static final Log LOG = LogFactory.getLog(InactivityMonitorTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InactivityMonitorTest.class);
 
     public Runnable serverRunOnCommand;
     public Runnable clientRunOnCommand;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslContextNBrokerServiceTest.java Mon Nov  1 16:54:07 2010
@@ -32,13 +32,13 @@ import junit.framework.TestCase;
 
 import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.legacy.broker.TransportConnector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 
 public class SslContextNBrokerServiceTest extends TestCase {
-    private static final transient Log LOG = LogFactory.getLog(SslContextNBrokerServiceTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(SslContextNBrokerServiceTest.class);
     
     private ClassPathXmlApplicationContext context;
     Map beansOfType;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/SslTransportFactoryTest.java Mon Nov  1 16:54:07 2010
@@ -26,11 +26,11 @@ import junit.framework.TestCase;
 import org.apache.activemq.openwire.OpenWireFormat;
 import org.apache.activemq.apollo.transport.tcp.SslTransportFactory;
 import org.apache.activemq.apollo.transport.tcp.SslTransportServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class SslTransportFactoryTest extends TestCase {
-    private static final Log LOG = LogFactory.getLog(SslTransportFactoryTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SslTransportFactoryTest.class);
 
     private SslTransportFactory factory;
     private boolean verbose;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/TransportUriTest.java Mon Nov  1 16:54:07 2010
@@ -24,14 +24,14 @@ import junit.framework.Test;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.legacy.test4.EmbeddedBrokerTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  */
 public class TransportUriTest extends EmbeddedBrokerTestSupport {
 
-	private static final Log LOG = LogFactory.getLog(TransportUriTest.class);
+	private static final Logger LOG = LoggerFactory.getLogger(TransportUriTest.class);
 	
     protected Connection connection;
     

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/WireformatNegociationTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/WireformatNegociationTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/WireformatNegociationTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/transport/tcp/WireformatNegociationTest.java Mon Nov  1 16:54:07 2010
@@ -32,11 +32,11 @@ import org.apache.activemq.transport.Tra
 import org.apache.activemq.transport.TransportFactory;
 import org.apache.activemq.transport.TransportListener;
 import org.apache.activemq.transport.TransportServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class WireformatNegociationTest extends CombinationTestSupport {
-    private static final Log LOG = LogFactory.getLog(WireformatNegociationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WireformatNegociationTest.class);
 
     private TransportServer server;
     private Transport clientTransport;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositeConsumeTest.java Mon Nov  1 16:54:07 2010
@@ -21,14 +21,14 @@ import javax.jms.Message;
 
 import org.apache.activemq.apollo.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1.1.1 $
  */
 public class CompositeConsumeTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
-    private static final Log LOG = LogFactory.getLog(CompositeConsumeTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CompositeConsumeTest.class);
 
     public void testSendReceive() throws Exception {
         messages.clear();

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CompositePublishTest.java Mon Nov  1 16:54:07 2010
@@ -29,14 +29,14 @@ import javax.jms.Session;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.apollo.test3.JmsSendReceiveTestSupport;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1.1.1 $
  */
 public class CompositePublishTest extends JmsSendReceiveTestSupport {
-    private static final Log LOG = LogFactory.getLog(CompositePublishTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CompositePublishTest.class);
 
     protected Connection sendConnection;
     protected Connection receiveConnection;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ConsumeTopicPrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ConsumeTopicPrefetchTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ConsumeTopicPrefetchTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/ConsumeTopicPrefetchTest.java Mon Nov  1 16:54:07 2010
@@ -22,14 +22,14 @@ import javax.jms.Message;
 import javax.jms.TextMessage;
 
 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;
 
 /**
  * @version $Revision: 1.1.1.1 $
  */
 public class ConsumeTopicPrefetchTest extends ProducerConsumerTestSupport {
-    private static final Log LOG = LogFactory.getLog(ConsumeTopicPrefetchTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConsumeTopicPrefetchTest.class);
 
     protected int prefetchSize = 100;
     protected String[] messageTexts;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/CreateLotsOfTemporaryQueuesTest.java Mon Nov  1 16:54:07 2010
@@ -24,14 +24,14 @@ import junit.framework.TestSuite;
 import junit.textui.TestRunner;
 
 import org.apache.activemq.legacy.test4.EmbeddedBrokerAndConnectionTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1 $
  */
 public class CreateLotsOfTemporaryQueuesTest extends EmbeddedBrokerAndConnectionTestSupport {
-    private static final Log LOG = LogFactory.getLog(CreateLotsOfTemporaryQueuesTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CreateLotsOfTemporaryQueuesTest.class);
 
     private static int numberToCreate = 500;
     private static long sleep = 20;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DispatchMultipleConsumersTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DispatchMultipleConsumersTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DispatchMultipleConsumersTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DispatchMultipleConsumersTest.java Mon Nov  1 16:54:07 2010
@@ -29,8 +29,8 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -38,7 +38,7 @@ import org.apache.commons.logging.LogFac
  *
  */
 public class DispatchMultipleConsumersTest extends TestCase {
-    private final static Log logger = LogFactory.getLog(DispatchMultipleConsumersTest.class);
+    private final static Logger logger = LoggerFactory.getLogger(DispatchMultipleConsumersTest.class);
     BrokerService broker;
     Destination dest;
     String destinationName = "TEST.Q";

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/DurableConsumerCloseAndReconnectTest.java Mon Nov  1 16:54:07 2010
@@ -29,15 +29,15 @@ import javax.jms.Topic;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.apollo.test3.TestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1.1.1 $
  */
 public class DurableConsumerCloseAndReconnectTest extends TestSupport {
     protected static final long RECEIVE_TIMEOUT = 5000L;
-    private static final Log LOG = LogFactory.getLog(DurableConsumerCloseAndReconnectTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DurableConsumerCloseAndReconnectTest.class);
 
     private Connection connection;
     private Session session;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/MessageGroupNewConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/MessageGroupNewConsumerTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/MessageGroupNewConsumerTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/MessageGroupNewConsumerTest.java Mon Nov  1 16:54:07 2010
@@ -28,8 +28,8 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import junit.framework.TestCase;
 
 /*
@@ -42,7 +42,7 @@ import junit.framework.TestCase;
  * See bug AMQ-2016: Message grouping fails when consumers are added
  */
 public class MessageGroupNewConsumerTest extends TestCase {
-    private static final Log LOG = LogFactory.getLog(MessageGroupNewConsumerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageGroupNewConsumerTest.class);
     private Connection connection;
     // Released after the messages are created
     private CountDownLatch latchMessagesCreated = new CountDownLatch(1);

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NewConsumerCreatesDestinationTest.java Mon Nov  1 16:54:07 2010
@@ -24,15 +24,15 @@ import javax.jms.Session;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.legacy.test4.EmbeddedBrokerAndConnectionTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
  * @version $Revision: $
  */
 public class NewConsumerCreatesDestinationTest extends EmbeddedBrokerAndConnectionTestSupport {
-    private static final Log LOG = LogFactory.getLog(NewConsumerCreatesDestinationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NewConsumerCreatesDestinationTest.class);
 
     private ActiveMQQueue wildcard;
     

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NoDuplicateOnTopicNetworkTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NoDuplicateOnTopicNetworkTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NoDuplicateOnTopicNetworkTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/NoDuplicateOnTopicNetworkTest.java Mon Nov  1 16:54:07 2010
@@ -21,13 +21,13 @@ import javax.jms.Topic;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.legacy.broker.BrokerService;
 import org.apache.activemq.network.NetworkConnector;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import junit.framework.TestCase;
 
 public class NoDuplicateOnTopicNetworkTest extends TestCase {
-    private static final Log LOG = LogFactory
+    private static final Logger LOG = LogFactory
             .getLog(NoDuplicateOnTopicNetworkTest.class);
 
     private static final String MULTICAST_DEFAULT = "multicast://default";

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageInTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageInTransactionTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageInTransactionTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageInTransactionTest.java Mon Nov  1 16:54:07 2010
@@ -35,12 +35,12 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class PublishOnQueueConsumedMessageInTransactionTest extends TestCase implements MessageListener {
 
-    private static final Log LOG = LogFactory.getLog(PublishOnQueueConsumedMessageInTransactionTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PublishOnQueueConsumedMessageInTransactionTest.class);
 
     private Session producerSession;
     private Session consumerSession;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java Mon Nov  1 16:54:07 2010
@@ -21,8 +21,8 @@ import java.io.File;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
@@ -33,7 +33,7 @@ import org.springframework.core.io.Resou
  */
 public class PublishOnQueueConsumedMessageUsingActivemqXMLTest extends PublishOnTopicConsumedMessageTest {
     protected static final String JOURNAL_ROOT = "../data/";
-    private static final transient Log LOG = LogFactory.getLog(PublishOnQueueConsumedMessageUsingActivemqXMLTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(PublishOnQueueConsumedMessageUsingActivemqXMLTest.class);
     BrokerService broker;
 
     /**

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumedMessageTest.java Mon Nov  1 16:54:07 2010
@@ -22,15 +22,15 @@ import javax.jms.Message;
 import javax.jms.MessageProducer;
 
 import org.apache.activemq.apollo.test3.JmsTopicSendReceiveWithTwoConnectionsTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1.1.1 $
  */
 public class PublishOnTopicConsumedMessageTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
 
-    private static final Log LOG = LogFactory.getLog(PublishOnTopicConsumedMessageTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PublishOnTopicConsumedMessageTest.class);
 
     private MessageProducer replyProducer;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java Mon Nov  1 16:54:07 2010
@@ -21,8 +21,8 @@ import java.io.File;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.xbean.BrokerFactoryBean;
 import org.apache.activemq.legacy.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
@@ -33,7 +33,7 @@ import org.springframework.core.io.Resou
  */
 public class PublishOnTopicConsumerMessageUsingActivemqXMLTest extends PublishOnTopicConsumedMessageTest {
     protected static final String JOURNAL_ROOT = "../data/";
-    private static final transient Log LOG = LogFactory.getLog(PublishOnTopicConsumerMessageUsingActivemqXMLTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(PublishOnTopicConsumerMessageUsingActivemqXMLTest.class);
 
     BrokerService broker;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueDuplicatesTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueDuplicatesTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueDuplicatesTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueDuplicatesTest.java Mon Nov  1 16:54:07 2010
@@ -37,12 +37,12 @@ import javax.jms.TextMessage;
 import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class QueueDuplicatesTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(QueueDuplicatesTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(QueueDuplicatesTest.class);
 
     private static DateFormat formatter = new SimpleDateFormat("HH:mm:ss SSS");
     private String brokerUrl;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueRepeaterTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueRepeaterTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueRepeaterTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/QueueRepeaterTest.java Mon Nov  1 16:54:07 2010
@@ -33,8 +33,8 @@ import javax.jms.TextMessage;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author pragmasoft
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
  */
 public final class QueueRepeaterTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(QueueRepeaterTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(QueueRepeaterTest.class);
 
     private volatile String receivedText;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/SubscribeClosePublishThenConsumeTest.java Mon Nov  1 16:54:07 2010
@@ -27,15 +27,15 @@ import javax.jms.TopicSubscriber;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.apollo.test3.TestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author Paul Smith
  * @version $Revision: 1.1.1.1 $
  */
 public class SubscribeClosePublishThenConsumeTest extends TestSupport {
-    private static final Log LOG = LogFactory.getLog(SubscribeClosePublishThenConsumeTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SubscribeClosePublishThenConsumeTest.class);
 
     public void testDurableTopic() throws Exception {
         ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://locahost");

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TestSupport.java Mon Nov  1 16:54:07 2010
@@ -27,8 +27,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Useful base class for unit test cases
@@ -37,7 +37,7 @@ import org.apache.commons.logging.LogFac
  */
 public class TestSupport extends TestCase {
     
-    private static final Log LOG = LogFactory.getLog(TestSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
     
     protected ActiveMQConnectionFactory connectionFactory;
     protected boolean topic = true;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionRollbackOrderTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionRollbackOrderTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionRollbackOrderTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionRollbackOrderTest.java Mon Nov  1 16:54:07 2010
@@ -33,8 +33,8 @@ import javax.jms.TextMessage;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test case for AMQ-268
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.1 $
  */
 public final class TransactionRollbackOrderTest extends TestCase {
-    private static final Log LOG = LogFactory.getLog(TransactionRollbackOrderTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionRollbackOrderTest.class);
 
     private volatile String receivedText;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-all/src/test/java/org/apache/activemq/legacy/usecases/TransactionTest.java Mon Nov  1 16:54:07 2010
@@ -34,8 +34,8 @@ import javax.jms.TextMessage;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author pragmasoft
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
  */
 public final class TransactionTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(TransactionTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionTest.class);
 
     private volatile String receivedText;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java Mon Nov  1 16:54:07 2010
@@ -98,8 +98,8 @@ import org.apache.activemq.util.JMSExcep
 import org.apache.activemq.util.LongSequenceGenerator;
 import org.apache.activemq.util.ServiceSupport;
 import org.apache.activemq.advisory.DestinationSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActiveMQConnection implements Connection, TopicConnection, QueueConnection, StatsCapable, Closeable, StreamConnection, TransportListener, EnhancedConnection, IConnection {
 
@@ -107,7 +107,7 @@ public class ActiveMQConnection implemen
     public static final String DEFAULT_PASSWORD = ActiveMQConnectionFactory.DEFAULT_PASSWORD;
     public static final String DEFAULT_BROKER_URL = ActiveMQConnectionFactory.DEFAULT_BROKER_URL;
 
-    private static final Log LOG = LogFactory.getLog(ActiveMQConnection.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQConnection.class);
     private static final IdGenerator CONNECTION_ID_GENERATOR = new IdGenerator();
 
     public final ConcurrentHashMap<ActiveMQTempDestination, ActiveMQTempDestination> activeTempDestinations = new ConcurrentHashMap<ActiveMQTempDestination, ActiveMQTempDestination>();

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Mon Nov  1 16:54:07 2010
@@ -56,8 +56,8 @@ import org.apache.activemq.transaction.S
 import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.IntrospectionSupport;
 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;
 
 /**
  * A client uses a <CODE>MessageConsumer</CODE> object to receive messages
@@ -97,7 +97,7 @@ import org.apache.commons.logging.LogFac
  */
 public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsCapable, ActiveMQDispatcher {
 
-    private static final Log LOG = LogFactory.getLog(ActiveMQMessageConsumer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQMessageConsumer.class);
     protected static final Scheduler scheduler = Scheduler.getInstance();
     protected final ActiveMQSession session;
     protected final ConsumerInfo info;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java Mon Nov  1 16:54:07 2010
@@ -17,8 +17,8 @@
 package org.apache.activemq;
 
 import java.io.Serializable;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Defines the prefetch message policies for different types of consumers
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.3 $
  */
 public class ActiveMQPrefetchPolicy implements Serializable {
-    private static final Log LOG = LogFactory.getLog(ActiveMQPrefetchPolicy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQPrefetchPolicy.class);
     private static final int MAX_PREFETCH_SIZE = Short.MAX_VALUE - 1;
     private int queuePrefetch;
     private int queueBrowserPrefetch;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java Mon Nov  1 16:54:07 2010
@@ -27,8 +27,8 @@ import org.apache.activemq.thread.Schedu
 import org.apache.activemq.transaction.Synchronization;
 import org.apache.activemq.util.Callback;
 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 javax.jms.*;
 import javax.jms.IllegalStateException;
@@ -148,7 +148,7 @@ public class ActiveMQSession implements 
         void afterDelivery(ActiveMQSession session, Message msg);
     }
 
-    private static final Log LOG = LogFactory.getLog(ActiveMQSession.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQSession.class);
     protected static final Scheduler scheduler = Scheduler.getInstance();
 
     protected int acknowledgementMode;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java Mon Nov  1 16:54:07 2010
@@ -26,8 +26,8 @@ import org.apache.activemq.command.Messa
 import org.apache.activemq.thread.Task;
 import org.apache.activemq.thread.TaskRunner;
 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;
 
 /**
  * A utility class used by the Session for dispatching messages asynchronously
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFac
  * @see javax.jms.Session
  */
 public class ActiveMQSessionExecutor implements Task {
-    private static final Log LOG = LogFactory.getLog(ActiveMQSessionExecutor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQSessionExecutor.class);
 
     private ActiveMQSession session;
     private MessageDispatchChannel messageQueue = new MessageDispatchChannel();

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java Mon Nov  1 16:54:07 2010
@@ -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/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java Mon Nov  1 16:54:07 2010
@@ -38,8 +38,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
@@ -61,7 +61,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 ConcurrentHashMap<TransactionId, List<TransactionContext>> ENDED_XA_TRANSACTION_CONTEXTS = new ConcurrentHashMap<TransactionId, List<TransactionContext>>();

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java Mon Nov  1 16:54:07 2010
@@ -35,8 +35,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
  * 
  */
 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/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java Mon Nov  1 16:54:07 2010
@@ -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
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
  *
  */
 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;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java Mon Nov  1 16:54:07 2010
@@ -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
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
  * 
  */
 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/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java Mon Nov  1 16:54:07 2010
@@ -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/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/ActiveMQConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/ActiveMQConnectionFactoryTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/ActiveMQConnectionFactoryTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/ActiveMQConnectionFactoryTest.java Mon Nov  1 16:54:07 2010
@@ -36,11 +36,11 @@ import org.apache.activemq.apollo.transp
 import org.apache.activemq.broker.store.memory.MemoryStore;
 import org.apache.activemq.transport.TransportFactory;
 import org.apache.activemq.transport.TransportServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ActiveMQConnectionFactoryTest extends AutoFailTestSupport {
-    private static final Log LOG = LogFactory.getLog(ActiveMQConnectionFactoryTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQConnectionFactoryTest.class);
 
     private ActiveMQConnection connection;
     private Broker broker;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/DefaultQueueSender.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/DefaultQueueSender.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/DefaultQueueSender.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/DefaultQueueSender.java Mon Nov  1 16:54:07 2010
@@ -37,8 +37,8 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A simple queue sender which does not use JNDI
@@ -47,7 +47,7 @@ import org.apache.commons.logging.LogFac
  */
 public final class DefaultQueueSender {
 
-    private static final Log LOG = LogFactory.getLog(DefaultQueueSender.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DefaultQueueSender.class);
 
     private DefaultQueueSender() {    
     }

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleProducer.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleProducer.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleProducer.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleProducer.java Mon Nov  1 16:54:07 2010
@@ -39,8 +39,8 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 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 simple polymorphic JMS producer which can work with Queues or Topics which
@@ -50,7 +50,7 @@ import org.apache.commons.logging.LogFac
  */
 public final class SimpleProducer {
 
-    private static final Log LOG = LogFactory.getLog(SimpleProducer.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleProducer.class);
 
     private SimpleProducer() {
     }

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueReceiver.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueReceiver.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueReceiver.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueReceiver.java Mon Nov  1 16:54:07 2010
@@ -37,12 +37,12 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class SimpleQueueReceiver {
 
-    private static final Log LOG = LogFactory.getLog(SimpleQueueReceiver.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleQueueReceiver.class);
 
     private SimpleQueueReceiver() {
     }

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueSender.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueSender.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueSender.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/demo/SimpleQueueSender.java Mon Nov  1 16:54:07 2010
@@ -40,12 +40,12 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class SimpleQueueSender {
 
-    private static final Log LOG = LogFactory.getLog(SimpleQueueSender.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SimpleQueueSender.class);
 
     private SimpleQueueSender() {
     }

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSConsumerTest.java Mon Nov  1 16:54:07 2010
@@ -43,8 +43,8 @@ import org.apache.activemq.ActiveMQMessa
 import org.apache.activemq.ActiveMQSession;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Ignore;
 
 
@@ -55,7 +55,7 @@ import org.junit.Ignore;
 @Ignore // this test is now hanging.. this was passing at one point..
 public class JMSConsumerTest extends JmsTestSupport {
 
-    private static final Log LOG = LogFactory.getLog(JMSConsumerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JMSConsumerTest.class);
 
     public ActiveMQDestination destination;
     public int deliveryMode;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java Mon Nov  1 16:54:07 2010
@@ -41,8 +41,8 @@ import org.apache.activemq.apollo.test1.
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.transport.TransportFactory;
 import org.apache.activemq.transport.TransportServer;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Small burn test moves sends a moderate amount of messages through the broker,
@@ -51,7 +51,7 @@ import org.apache.commons.logging.LogFac
  * 
  */
 public class LoadTestBurnIn extends JmsTestSupport {
-    private static final transient Log LOG = LogFactory.getLog(LoadTestBurnIn.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(LoadTestBurnIn.class);
 
     public ActiveMQDestination destination;
     public int deliveryMode;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JMSDurableTopicRedeliverTest.java Mon Nov  1 16:54:07 2010
@@ -20,15 +20,15 @@ import javax.jms.Message;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.4 $
  */
 public class JMSDurableTopicRedeliverTest extends JmsTopicRedeliverTest {
 
-    private static final Log LOG = LogFactory.getLog(JMSDurableTopicRedeliverTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JMSDurableTopicRedeliverTest.class);
 
     protected void setUp() throws Exception {
         durable = true;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveTestSupport.java Mon Nov  1 16:54:07 2010
@@ -33,14 +33,14 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.7 $
  */
 abstract public class JmsSendReceiveTestSupport extends TestSupport implements MessageListener {
-    private static final Log LOG = LogFactory.getLog(JmsSendReceiveTestSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsSendReceiveTestSupport.class);
 
     protected int messageCount = 100;
     protected String[] data;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsSendReceiveWithMessageExpirationTest.java Mon Nov  1 16:54:07 2010
@@ -28,8 +28,8 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Ignore;
 
 /**
@@ -38,7 +38,7 @@ import org.junit.Ignore;
 @Ignore // Failing locking up with a java.lang.AssertionError
 public class JmsSendReceiveWithMessageExpirationTest extends TestSupport {
 
-    private static final Log LOG = LogFactory.getLog(JmsSendReceiveWithMessageExpirationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsSendReceiveWithMessageExpirationTest.class);
 
     protected int messageCount = 100;
     protected String[] data;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicRedeliverTest.java Mon Nov  1 16:54:07 2010
@@ -27,15 +27,15 @@ import javax.jms.TextMessage;
 import javax.jms.Topic;
 
 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;
 
 /**
  * @version $Revision: 1.4 $
  */
 public class JmsTopicRedeliverTest extends TestSupport {
 
-    private static final Log LOG = LogFactory.getLog(JmsTopicRedeliverTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRedeliverTest.class);
 
     protected Connection connection;
     protected Session session;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSelectorTest.java Mon Nov  1 16:54:07 2010
@@ -28,14 +28,14 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.2 $
  */
 public class JmsTopicSelectorTest extends TestSupport {
-    private static final Log LOG = LogFactory.getLog(JmsTopicSelectorTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSelectorTest.class);
 
     protected Connection connection;
     protected Session session;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test2/JmsTopicSendReceiveTest.java Mon Nov  1 16:54:07 2010
@@ -23,14 +23,14 @@ import javax.jms.MessageConsumer;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-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 JmsTopicSendReceiveTest extends JmsSendReceiveTestSupport {
-    private static final Log LOG = LogFactory.getLog(JmsTopicSendReceiveTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveTest.class);
 
     protected Connection connection;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/CreateConsumerButDontStartConnectionWarningTest.java Mon Nov  1 16:54:07 2010
@@ -18,14 +18,14 @@ package org.apache.activemq.apollo.test3
 
 import javax.jms.JMSException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.1 $
  */
 public class CreateConsumerButDontStartConnectionWarningTest extends JmsQueueSendReceiveTest {
-    private static final transient Log LOG = LogFactory.getLog(CreateConsumerButDontStartConnectionWarningTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(CreateConsumerButDontStartConnectionWarningTest.class);
 
     @Override
     protected void startConnection() throws JMSException {

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsQueueSendReceiveTwoConnectionsTest.java Mon Nov  1 16:54:07 2010
@@ -16,8 +16,8 @@
  */
 package org.apache.activemq.apollo.test3;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.2 $

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsSendReceiveTestSupport.java Mon Nov  1 16:54:07 2010
@@ -35,14 +35,14 @@ import javax.jms.TextMessage;
 
 import junit.framework.AssertionFailedError;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.2 $
  */
 public abstract class JmsSendReceiveTestSupport extends TestSupport implements MessageListener {
-    private static final Log LOG = LogFactory.getLog(JmsSendReceiveTestSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsSendReceiveTestSupport.class);
 
     protected int messageCount = 100;
     protected String[] data;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicRequestReplyTest.java Mon Nov  1 16:54:07 2010
@@ -29,14 +29,14 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-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 JmsTopicRequestReplyTest extends TestSupport implements MessageListener {
-    private static final Log LOG = LogFactory.getLog(JmsTopicRequestReplyTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicRequestReplyTest.class);
 
     protected boolean useAsyncConsume;
     private Connection serverConnection;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveTest.java Mon Nov  1 16:54:07 2010
@@ -23,14 +23,14 @@ import javax.jms.MessageConsumer;
 import javax.jms.Session;
 import javax.jms.Topic;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.2 $
  */
 public class JmsTopicSendReceiveTest extends JmsSendReceiveTestSupport {
-    private static final Log LOG = LogFactory.getLog(JmsTopicSendReceiveTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveTest.class);
 
     protected Connection connection;
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTopicSendReceiveWithTwoConnectionsTest.java Mon Nov  1 16:54:07 2010
@@ -23,15 +23,15 @@ import javax.jms.MessageConsumer;
 import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
-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 JmsTopicSendReceiveWithTwoConnectionsTest extends JmsSendReceiveTestSupport {
 
-    private static final Log LOG = LogFactory.getLog(JmsTopicSendReceiveWithTwoConnectionsTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTopicSendReceiveWithTwoConnectionsTest.class);
 
     protected Connection sendConnection;
     protected Connection receiveConnection;

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/JmsTransactionTestSupport.java Mon Nov  1 16:54:07 2010
@@ -38,15 +38,15 @@ import org.apache.activemq.ActiveMQPrefe
 import org.apache.activemq.apollo.broker.Broker;
 import org.apache.activemq.apollo.broker.BrokerFactory;
 import org.apache.activemq.transport.TransportFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.9 $
  */
 public abstract class JmsTransactionTestSupport extends TestSupport implements MessageListener {
 
-    private static final Log LOG = LogFactory.getLog(JmsTransactionTestSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JmsTransactionTestSupport.class);
     private static final int MESSAGE_COUNT = 5;
     private static final String MESSAGE_TEXT = "message";
 

Modified: activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java?rev=1029743&r1=1029742&r2=1029743&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java (original)
+++ activemq/activemq-apollo/trunk/sandbox/activemq-client/src/test/java/org/apache/activemq/apollo/test3/TestSupport.java Mon Nov  1 16:54:07 2010
@@ -30,8 +30,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Useful base class for unit test cases
@@ -39,7 +39,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision: 1.4 $
  */
 public abstract class TestSupport extends TestCase {
-    private static final Log LOG = LogFactory.getLog(TestSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
     
     protected ActiveMQConnectionFactory connectionFactory;
     protected boolean topic = true;



Mime
View raw message