activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1069405 [6/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/test/java/org/apache/activemq/broker/SpringTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/SpringTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/SpringTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/SpringTest.java Thu Feb 10 14:24:01 2011
@@ -24,14 +24,14 @@ import junit.framework.TestCase;
 
 import org.apache.activemq.spring.SpringConsumer;
 import org.apache.activemq.spring.SpringProducer;
-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.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class SpringTest extends TestCase {
     
-    private static final Log LOG = LogFactory.getLog(SpringTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SpringTest.class);
 
     protected AbstractApplicationContext context;
     protected SpringConsumer consumer;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java Thu Feb 10 14:24:01 2011
@@ -21,12 +21,12 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 
 public class DbRestartJDBCQueueMasterSlaveTest extends JDBCQueueMasterSlaveTest {
-    private static final transient Log LOG = LogFactory.getLog(DbRestartJDBCQueueMasterSlaveTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(DbRestartJDBCQueueMasterSlaveTest.class);
     
     protected void messageSent() throws Exception {    
         if (++inflightMessageCount == failureCount) {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveProducerFlowControlTest.java Thu Feb 10 14:24:01 2011
@@ -22,11 +22,11 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.broker.region.policy.VMPendingQueueMessageStoragePolicy;
 import org.apache.activemq.broker.region.policy.VMPendingSubscriberMessageStoragePolicy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MasterSlaveProducerFlowControlTest extends ProducerFlowControlTest {
-    static final Log LOG = LogFactory.getLog(MasterSlaveProducerFlowControlTest.class);
+    static final Logger LOG = LoggerFactory.getLogger(MasterSlaveProducerFlowControlTest.class);
     BrokerService slave;
     protected BrokerService createBroker() throws Exception {
         BrokerService service = super.createBroker();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/MasterSlaveSlaveDieTest.java Thu Feb 10 14:24:01 2011
@@ -25,12 +25,12 @@ import junit.framework.TestCase;
 import org.apache.activemq.broker.BrokerPlugin;
 import org.apache.activemq.broker.BrokerPluginSupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MasterSlaveSlaveDieTest extends TestCase {
     
-    private static final Log LOG = LogFactory.getLog(MasterSlaveSlaveDieTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MasterSlaveSlaveDieTest.class);
 
     private final AtomicBoolean pluginStopped = new AtomicBoolean(false);
     class Plugin extends BrokerPluginSupport {
@@ -95,4 +95,4 @@ public class MasterSlaveSlaveDieTest ext
         master.stop();
         master.waitUntilStopped();
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/ft/QueueMasterSlaveTest.java Thu Feb 10 14:24:01 2011
@@ -25,15 +25,15 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.JmsTopicSendReceiveWithTwoConnectionsTest;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.xbean.BrokerFactoryBean;
-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;
 
 /**
  * Test failover for Queues
  */
 public class QueueMasterSlaveTest extends JmsTopicSendReceiveWithTwoConnectionsTest {
-    private static final transient Log LOG = LogFactory.getLog(QueueMasterSlaveTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(QueueMasterSlaveTest.class);
 
     protected BrokerService master;
     protected AtomicReference<BrokerService> slave = new AtomicReference<BrokerService>();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/MBeanTest.java Thu Feb 10 14:24:01 2011
@@ -50,8 +50,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTempQueue;
 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;
 
 /**
  * A test case of the various MBeans in ActiveMQ. If you want to look at the
@@ -61,7 +61,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class MBeanTest extends EmbeddedBrokerTestSupport {
-    private static final Log LOG = LogFactory.getLog(MBeanTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MBeanTest.class);
 
     private static boolean waitForKeyPress;
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/jmx/PurgeTest.java Thu Feb 10 14:24:01 2011
@@ -31,8 +31,8 @@ import org.apache.activemq.store.Persist
 import org.apache.activemq.store.amq.AMQPersistenceAdapter;
 import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
 import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A specific test of Queue.purge() functionality
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
  * @version $Revision$
  */
 public class PurgeTest extends EmbeddedBrokerTestSupport {
-    private static final Log LOG = LogFactory.getLog(PurgeTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PurgeTest.class);
 
     protected MBeanServer mbeanServer;
     protected String domain = "org.apache.activemq";

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/AbortSlowConsumerTest.java Thu Feb 10 14:24:01 2011
@@ -26,8 +26,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQDestination;
 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;
 
 import javax.jms.Connection;
 import javax.jms.ExceptionListener;
@@ -45,7 +45,7 @@ import java.util.concurrent.TimeUnit;
 
 public class AbortSlowConsumerTest extends JmsMultipleClientsTestSupport implements ExceptionListener {
 
-    private static final Log LOG = LogFactory.getLog(AbortSlowConsumerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbortSlowConsumerTest.class);
 
     AbortSlowConsumerStrategy underTest;
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTest.java Thu Feb 10 14:24:01 2011
@@ -23,15 +23,15 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.RedeliveryPolicy;
 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;
 
 /**
  * 
  * @version $Revision$
  */
 public class DeadLetterTest extends DeadLetterTestSupport {
-    private static final Log LOG = LogFactory.getLog(DeadLetterTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DeadLetterTest.class);
 
     protected int rollbackCount;
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java Thu Feb 10 14:24:01 2011
@@ -36,14 +36,14 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.DeadLetterStrategy;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public abstract class DeadLetterTestSupport extends TestSupport {
-    private static final Log LOG = LogFactory.getLog(DeadLetterTestSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DeadLetterTestSupport.class);
 
     protected int messageCount = 10;
     protected long timeToLive;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterTest.java Thu Feb 10 14:24:01 2011
@@ -31,14 +31,14 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 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;
 
 /**
  * @version $Revision$
  */
 public class IndividualDeadLetterTest extends DeadLetterTest {
-    private static final Log LOG = LogFactory.getLog(IndividualDeadLetterTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IndividualDeadLetterTest.class);
 
     protected BrokerService createBroker() throws Exception {
         BrokerService broker = super.createBroker();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/IndividualDeadLetterViaXmlTest.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import javax.jms.Destination;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.xbean.BrokerFactoryBean;
-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;
 
 /**
@@ -30,7 +30,7 @@ import org.springframework.core.io.Class
  * @version $Revision$
  */
 public class IndividualDeadLetterViaXmlTest extends DeadLetterTest {
-    private static final Log LOG = LogFactory.getLog(IndividualDeadLetterViaXmlTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IndividualDeadLetterViaXmlTest.class);
 
 
     protected BrokerService createBroker() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/MessageListenerDeadLetterTest.java Thu Feb 10 14:24:01 2011
@@ -28,12 +28,12 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.RedeliveryPolicy;
 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 class MessageListenerDeadLetterTest extends DeadLetterTestSupport {
-    private static final Log LOG = LogFactory
-            .getLog(MessageListenerDeadLetterTest.class);
+    private static final Logger LOG = LoggerFactory
+            .getLogger(MessageListenerDeadLetterTest.class);
 
     private int rollbackCount;
 
@@ -148,4 +148,4 @@ public class MessageListenerDeadLetterTe
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/policy/NoRetryDeadLetterTest.java Thu Feb 10 14:24:01 2011
@@ -18,11 +18,11 @@ package org.apache.activemq.broker.polic
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.RedeliveryPolicy;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class NoRetryDeadLetterTest extends DeadLetterTest {
-    private static final Log LOG = LogFactory.getLog(NoRetryDeadLetterTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NoRetryDeadLetterTest.class);
 
     protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
         ActiveMQConnectionFactory connectionFactory = super.createConnectionFactory();

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueueDuplicatesFromStoreTest.java Thu Feb 10 14:24:01 2011
@@ -48,16 +48,16 @@ import org.apache.activemq.state.Produce
 import org.apache.activemq.store.MessageStore;
 import org.apache.activemq.store.PersistenceAdapter;
 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;
 
 /**
  * @author gtully
  * @see https://issues.apache.org/activemq/browse/AMQ-2020
  **/
 public class QueueDuplicatesFromStoreTest extends TestCase {
-    private static final Log LOG = LogFactory
-            .getLog(QueueDuplicatesFromStoreTest.class);
+    private static final Logger LOG = LoggerFactory
+            .getLogger(QueueDuplicatesFromStoreTest.class);
 
     ActiveMQQueue destination = new ActiveMQQueue("queue-"
             + QueueDuplicatesFromStoreTest.class.getSimpleName());

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/QueuePurgeTest.java Thu Feb 10 14:24:01 2011
@@ -40,11 +40,11 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class QueuePurgeTest extends TestCase {
-    private static final Log LOG = LogFactory.getLog(QueuePurgeTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(QueuePurgeTest.class);
     private final String MESSAGE_TEXT = new String(new byte[1024]);
     BrokerService broker;
     ConnectionFactory factory;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java Thu Feb 10 14:24:01 2011
@@ -19,8 +19,8 @@ package org.apache.activemq.broker.regio
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -44,7 +44,7 @@ public abstract class CursorSupport exte
 
     public int MESSAGE_COUNT = 500;
     public int PREFETCH_SIZE = 50;
-    private static final Log LOG = LogFactory.getLog(CursorSupport.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CursorSupport.class);
 
     protected BrokerService broker;
     protected String bindAddress = "tcp://localhost:60706";
@@ -148,8 +148,8 @@ public abstract class CursorSupport exte
             Message consumed = consumerList.get(i);
             if (!sent.equals(consumed)) {
                 LOG.error("BAD MATCH AT POS " + i);
-                LOG.error(sent);
-                LOG.error(consumed);
+                LOG.error(sent.toString());
+                LOG.error(consumed.toString());
                 /*
                  * log.error("\n\n\n\n\n"); for (int j = 0; j <
                  * consumerList.size(); j++) { log.error(consumerList.get(j)); }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/NegativeQueueTest.java Thu Feb 10 14:24:01 2011
@@ -52,8 +52,8 @@ import org.apache.activemq.usage.StoreUs
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.usage.TempUsage;
 import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Modified CursorSupport Unit test to reproduce the negative queue issue.
@@ -79,7 +79,7 @@ import org.apache.commons.logging.LogFac
  * 
  */
 public class NegativeQueueTest extends AutoFailTestSupport {
-    private static final Log LOG = LogFactory.getLog(NegativeQueueTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NegativeQueueTest.class);
     
     public static SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd,hh:mm:ss:SSS");
     
@@ -414,4 +414,4 @@ public class NegativeQueueTest extends A
             }
         }
     }    
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/region/group/MessageGroupTest.java Thu Feb 10 14:24:01 2011
@@ -27,12 +27,12 @@ import org.apache.activemq.CombinationTe
 import org.apache.activemq.JmsTestSupport;
 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;
 
 public class MessageGroupTest extends JmsTestSupport {
 	
-	 private static final Log LOG = LogFactory.getLog(CombinationTestSupport.class);
+	 private static final Logger LOG = LoggerFactory.getLogger(CombinationTestSupport.class);
 
     public void testGroupedMessagesDeliveredToOnlyOneConsumer() throws Exception {
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerManagementTest.java Thu Feb 10 14:24:01 2011
@@ -34,12 +34,12 @@ import org.apache.activemq.ScheduledMess
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.util.IOHelper;
 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;
 
 public class JobSchedulerManagementTest extends EmbeddedBrokerTestSupport {
 
-    private static final transient Log LOG = LogFactory.getLog(JobSchedulerManagementTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(JobSchedulerManagementTest.class);
 
     public void testRemoveAllScheduled() throws Exception {
         final int COUNT = 5;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/store/LoadTester.java Thu Feb 10 14:24:01 2011
@@ -38,15 +38,15 @@ import org.apache.activemq.broker.Transp
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.memory.list.SimpleMessageList;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public class LoadTester extends JmsTestSupport {
 
-    private static final Log LOG = LogFactory.getLog(LoadTester.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoadTester.class);
     
     protected int messageSize = 1024 * 64;
     protected int produceCount = 10000;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/util/PluginBrokerTest.java Thu Feb 10 14:24:01 2011
@@ -25,15 +25,15 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQMessage;
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
  * @version $Revision: 564271 $
  */
 public class PluginBrokerTest extends JmsTopicSendReceiveTest {
-    private static final Log LOG = LogFactory.getLog(PluginBrokerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PluginBrokerTest.class);
     private BrokerService broker;
 
     protected void setUp() throws Exception {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/CompositeQueueTest.java Thu Feb 10 14:24:01 2011
@@ -32,8 +32,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.spring.ConsumerBean;
 import org.apache.activemq.xbean.XBeanBrokerFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * 
@@ -41,7 +41,7 @@ import org.apache.commons.logging.LogFac
  */
 public class CompositeQueueTest extends EmbeddedBrokerTestSupport {
 
-    private static final Log LOG = LogFactory.getLog(CompositeQueueTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CompositeQueueTest.class);
     
     protected int total = 10;
     protected Connection connection;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/MirroredQueueTest.java Thu Feb 10 14:24:01 2011
@@ -29,14 +29,14 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.spring.ConsumerBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: $
  */
 public class MirroredQueueTest extends EmbeddedBrokerTestSupport {
-    private static final transient Log LOG = LogFactory.getLog(MirroredQueueTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(MirroredQueueTest.class);
     private Connection connection;
 
     public void testSendingToQueueIsMirrored() throws Exception {
@@ -112,4 +112,4 @@ public class MirroredQueueTest extends E
         }
         super.tearDown();
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/virtual/VirtualTopicSelectorTest.java Thu Feb 10 14:24:01 2011
@@ -30,12 +30,12 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.spring.ConsumerBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class VirtualTopicSelectorTest extends CompositeTopicTest {
 
-    private static final Log LOG = LogFactory.getLog(VirtualTopicSelectorTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(VirtualTopicSelectorTest.class);
             
     protected Destination getConsumer1Dsetination() {
         return new ActiveMQQueue("Consumer.1.VirtualTopic.TEST");
@@ -102,4 +102,4 @@ public class VirtualTopicSelectorTest ex
         broker.setDestinationInterceptors(new DestinationInterceptor[]{interceptor});
         return broker;
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1866.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1866.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1866.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1866.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.PolicyMap;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.store.amq.AMQPersistenceAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This is a test case for the issue reported at:
@@ -47,7 +47,7 @@ import org.apache.commons.logging.LogFac
  */
 public class AMQ1866 extends TestCase {
 
-    private static final Log log = LogFactory.getLog(ConsumerThread.class);
+    private static final Logger log = LoggerFactory.getLogger(ConsumerThread.class);
     private BrokerService brokerService;
     private ArrayList<Thread> threads = new ArrayList<Thread>();
     

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ1893Test.java Thu Feb 10 14:24:01 2011
@@ -20,8 +20,8 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 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 javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -40,7 +40,7 @@ import java.util.concurrent.atomic.Atomi
 
 public class AMQ1893Test extends TestCase {
 
-    private static final Log log = LogFactory.getLog(AMQ1893Test.class);
+    private static final Logger log = LoggerFactory.getLogger(AMQ1893Test.class);
 
     static final String QUEUE_NAME = "TEST";
 
@@ -193,4 +193,4 @@ public class AMQ1893Test extends TestCas
 
     }
 
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2021Test.java Thu Feb 10 14:24:01 2011
@@ -38,8 +38,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.broker.BrokerService;
 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;
 
 /**
  * This is a test case for the issue reported at:
@@ -49,7 +49,7 @@ import org.apache.commons.logging.LogFac
  */
 public class AMQ2021Test extends TestCase implements ExceptionListener, UncaughtExceptionHandler {
 
-    private static final Log log = LogFactory.getLog(AMQ2021Test.class);
+    private static final Logger log = LoggerFactory.getLogger(AMQ2021Test.class);
     BrokerService brokerService;
     ArrayList<Thread> threads = new ArrayList<Thread>();
     Vector<Throwable> exceptions;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2084Test.java Thu Feb 10 14:24:01 2011
@@ -41,15 +41,15 @@ import javax.jms.TopicSubscriber;
 import javax.naming.InitialContext;
 
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 public class AMQ2084Test {
 
-    private static final Log LOG = LogFactory.getLog(AMQ2084Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2084Test.class);
     BrokerService broker;
     CountDownLatch qreceived;
     

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2102Test.java Thu Feb 10 14:24:01 2011
@@ -42,8 +42,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.CombinationTestSupport;
 import org.apache.activemq.RedeliveryPolicy;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2102Test extends CombinationTestSupport implements UncaughtExceptionHandler {
        
@@ -52,7 +52,7 @@ public class AMQ2102Test extends Combina
     final static int CONSUME_ALL = -1;
     
     
-    private static final Log LOG = LogFactory.getLog(AMQ2102Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2102Test.class);
     
     private final static Map<Thread, Throwable> exceptions = new ConcurrentHashMap<Thread, Throwable>();
     
@@ -391,7 +391,7 @@ public class AMQ2102Test extends Combina
         }
 
         public void onException(JMSException exception) {
-           LOG.error(exception);
+           LOG.error(exception.toString());
            exceptions.put(Thread.currentThread(), exception);
         }
     }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2149Test.java Thu Feb 10 14:24:01 2011
@@ -46,8 +46,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
 import org.apache.activemq.usage.MemoryUsage;
 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;
 
 interface Configurer {
     public void configure(BrokerService broker) throws Exception;
@@ -55,7 +55,7 @@ interface Configurer {
 
 public class AMQ2149Test extends AutoFailTestSupport {
 
-    private static final Log LOG = LogFactory.getLog(AMQ2149Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2149Test.class);
 
     private static final String BROKER_CONNECTOR = "tcp://localhost:61617";
     private static final String DEFAULT_BROKER_URL = "failover:("+ BROKER_CONNECTOR

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2183Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2183Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2183Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2183Test.java Thu Feb 10 14:24:01 2011
@@ -41,12 +41,12 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.util.Wait;
 import org.apache.activemq.util.Wait.Condition;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2183Test extends AutoFailTestSupport implements UncaughtExceptionHandler, MessageListener {
        
-    private static final Log LOG = LogFactory.getLog(AMQ2183Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2183Test.class);
     private static final int maxSent = 2000;    
     private final Map<Thread, Throwable> exceptions = new ConcurrentHashMap<Thread, Throwable>();
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2314Test.java Thu Feb 10 14:24:01 2011
@@ -35,8 +35,8 @@ import org.apache.activemq.CombinationTe
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class AMQ2314Test extends CombinationTestSupport {
@@ -44,7 +44,7 @@ public class AMQ2314Test extends Combina
     public boolean consumeAll = false;
     public int deliveryMode = DeliveryMode.NON_PERSISTENT;
     
-    private static final Log LOG = LogFactory.getLog(AMQ2314Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2314Test.class);
     private static final int MESSAGES_COUNT = 30000;
     private static byte[]  buf = new byte[1024];
     private BrokerService broker;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2356Test.java Thu Feb 10 14:24:01 2011
@@ -25,8 +25,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.perf.NumberOfDestinationsTest;
 import org.apache.activemq.store.kahadb.KahaDBStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import java.io.File;
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
@@ -63,7 +63,7 @@ deadlocked at less than 30 messages each
 public class AMQ2356Test extends TestCase {
     protected static final int MESSAGE_COUNT = 1000;
     protected static final int NUMBER_OF_PAIRS = 10;
-    private static final Log LOG = LogFactory.getLog(NumberOfDestinationsTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NumberOfDestinationsTest.class);
     protected BrokerService broker;
     protected String brokerURL = ActiveMQConnectionFactory.DEFAULT_BROKER_BIND_URL;
     protected int destinationCount;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2413Test.java Thu Feb 10 14:24:01 2011
@@ -48,11 +48,11 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.command.MessageId;
 import org.apache.activemq.command.ProducerId;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2413Test extends CombinationTestSupport implements MessageListener {
-    private static final Log LOG = LogFactory.getLog(AMQ2413Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2413Test.class);
     BrokerService broker;
     private ActiveMQConnectionFactory factory;
 
@@ -191,7 +191,7 @@ public class AMQ2413Test extends Combina
                 ids[seq] = true;
             }
         } catch (Exception e) {
-            LOG.error(e);
+            LOG.error(e.toString());
         }
     }
 
@@ -340,4 +340,4 @@ public class AMQ2413Test extends Combina
     public static Test suite() {
        return suite(AMQ2413Test.class);
      }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2439Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2439Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2439Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2439Test.java Thu Feb 10 14:24:01 2011
@@ -28,11 +28,11 @@ import javax.jms.Session;
 import org.apache.activemq.JmsMultipleBrokersTestSupport;
 import org.apache.activemq.broker.jmx.BrokerView;
 import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2439Test extends JmsMultipleBrokersTestSupport {
-    private static final Log LOG = LogFactory.getLog(AMQ2439Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2439Test.class);
     Destination dest;
 
     

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2580Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2580Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2580Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2580Test.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.ActiveMQPrefetchPolicy;      
 import org.apache.activemq.TestSupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.jms.ConnectionFactory;
 import javax.jms.JMSException;
@@ -36,7 +36,7 @@ import javax.jms.TopicSession;
 
 public class AMQ2580Test extends TestSupport {
 
-    private static final Log LOG = LogFactory.getLog(AMQ2580Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2580Test.class);
 
     private static final String TOPIC_NAME = "topicName";
     private static final String CLIENT_ID = "client_id";

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584ConcurrentDlqTest.java Thu Feb 10 14:24:01 2011
@@ -42,15 +42,15 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.store.PersistenceAdapter;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.apache.activemq.util.IntrospectionSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // variation on AMQ2584 where the DLQ consumer works in parallel to producer so
 // that some dups are not suppressed as they are already acked by the consumer
 // the audit needs to be disabled to allow these dupes to be consumed
 public class AMQ2584ConcurrentDlqTest extends org.apache.activemq.TestSupport {
 
-    static final Log LOG = LogFactory.getLog(AMQ2584ConcurrentDlqTest.class);
+    static final Logger LOG = LoggerFactory.getLogger(AMQ2584ConcurrentDlqTest.class);
     BrokerService broker = null;
     ActiveMQTopic topic;
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java Thu Feb 10 14:24:01 2011
@@ -35,12 +35,12 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.store.PersistenceAdapter;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2584Test extends org.apache.activemq.TestSupport {
 
-    static final Log LOG = LogFactory.getLog(AMQ2584Test.class);
+    static final Logger LOG = LoggerFactory.getLogger(AMQ2584Test.class);
     BrokerService broker = null;
     ActiveMQTopic topic;
 
@@ -207,4 +207,4 @@ public class AMQ2584Test extends org.apa
         stopBroker();
         super.tearDown();
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2645Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2645Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2645Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2645Test.java Thu Feb 10 14:24:01 2011
@@ -32,11 +32,11 @@ import javax.jms.TextMessage;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2645Test extends EmbeddedBrokerTestSupport {
-    private static final Log LOG = LogFactory.getLog(AMQ2645Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2645Test.class);
     private final static String QUEUE_NAME = "test.daroo.q";
 
     public void testWaitForTransportInterruptionProcessingHang()
@@ -75,7 +75,7 @@ public class AMQ2645Test extends Embedde
                             thirdMessageReceived.countDown();
                         }
                     } catch (Exception e) {
-                        LOG.error(e);
+                        LOG.error(e.toString());
                         throw new RuntimeException(e);
                     }
                 }

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2751Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2751Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2751Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2751Test.java Thu Feb 10 14:24:01 2011
@@ -30,11 +30,11 @@ import javax.jms.Session;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2751Test extends EmbeddedBrokerTestSupport {
-    private static final Log LOG = LogFactory.getLog(AMQ2751Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2751Test.class);
 
     private static String clientIdPrefix = "consumer";
     private static String queueName = "FOO";

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java Thu Feb 10 14:24:01 2011
@@ -21,8 +21,8 @@ import org.apache.activemq.ActiveMQSessi
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Test;
 
 import javax.jms.Connection;
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertNot
 
 public class AMQ2832Test {
 
-    private static final Log LOG = LogFactory.getLog(AMQ2832Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ2832Test.class);
 
     BrokerService broker = null;
     private final Destination destination = new ActiveMQQueue("AMQ2832Test");

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2870Test.java Thu Feb 10 14:24:01 2011
@@ -32,12 +32,12 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.store.PersistenceAdapter;
 import org.apache.activemq.util.IntrospectionSupport;
 import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class AMQ2870Test extends org.apache.activemq.TestSupport {
 
-    static final Log LOG = LogFactory.getLog(AMQ2870Test.class);
+    static final Logger LOG = LoggerFactory.getLogger(AMQ2870Test.class);
     BrokerService broker = null;
     ActiveMQTopic topic;
 
@@ -198,4 +198,4 @@ public class AMQ2870Test extends org.apa
         stopBroker();
         super.tearDown();
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3120Test.java Thu Feb 10 14:24:01 2011
@@ -24,8 +24,8 @@ import org.apache.activemq.command.Activ
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.apache.activemq.util.ConsumerThread;
 import org.apache.activemq.util.ProducerThread;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.Test;
 
 import javax.jms.*;
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertEqu
 
 public class AMQ3120Test {
 
-    private static final Log LOG = LogFactory.getLog(AMQ3120Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ3120Test.class);
 
     BrokerService broker = null;
     File kahaDbDir = null;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3145Test.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3145Test.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3145Test.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3145Test.java Thu Feb 10 14:24:01 2011
@@ -34,8 +34,8 @@ import org.apache.activemq.broker.region
 import org.apache.activemq.broker.region.policy.PendingQueueMessageStoragePolicy;
 import org.apache.activemq.broker.region.policy.PolicyEntry;
 import org.apache.activemq.broker.region.policy.PolicyMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertTrue;
 
 public class AMQ3145Test {
-    private static final Log LOG = LogFactory.getLog(AMQ3145Test.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AMQ3145Test.class);
     private final String MESSAGE_TEXT = new String(new byte[1024]);
     BrokerService broker;
     ConnectionFactory factory;
@@ -144,4 +144,4 @@ public class AMQ3145Test {
         }
         consumer.close();
     }
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/ConnectionPerMessageTest.java Thu Feb 10 14:24:01 2011
@@ -29,12 +29,12 @@ import javax.jms.Topic;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EmbeddedBrokerTestSupport;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConnectionPerMessageTest extends EmbeddedBrokerTestSupport {
 
-	private static final Log LOG = LogFactory.getLog(ConnectionPerMessageTest.class);
+	private static final Logger LOG = LoggerFactory.getLogger(ConnectionPerMessageTest.class);
 	private static final int COUNT = 20000;
 	protected String bindAddress;
 
@@ -48,7 +48,7 @@ public class ConnectionPerMessageTest ex
 		for (int i = 0; i < COUNT; i++) {
 
 			if (i % 1000 == 0) {
-				LOG.info(i);
+				LOG.info(new Integer(i).toString());
 			}
 
 			Connection conn = null;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DataFileNotDeletedTest.java Thu Feb 10 14:24:01 2011
@@ -30,15 +30,15 @@ import org.apache.activemq.broker.Broker
 import org.apache.activemq.kaha.impl.async.AsyncDataManager;
 import org.apache.activemq.store.amq.AMQPersistenceAdapter;
 import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  * see https://issues.apache.org/activemq/browse/AMQ-1926
  */
 public class DataFileNotDeletedTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(DataFileNotDeletedTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DataFileNotDeletedTest.class);
 
     private final CountDownLatch latch = new CountDownLatch(max_messages);
     private static int max_messages = 600;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/DurableConsumerTest.java Thu Feb 10 14:24:01 2011
@@ -56,14 +56,14 @@ import org.apache.activemq.store.kahadb.
 import org.apache.activemq.store.kahadb.KahaDBStore;
 import org.apache.activemq.util.IOHelper;
 import org.apache.activemq.util.Wait;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.5 $ A Test case for AMQ-1479
  */
 public class DurableConsumerTest extends CombinationTestSupport{
-    private static final Log LOG = LogFactory.getLog(DurableConsumerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DurableConsumerTest.class);
     private static int COUNT = 1024 * 10;
     private static String CONSUMER_NAME = "DURABLE_TEST";
     protected BrokerService broker;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java Thu Feb 10 14:24:01 2011
@@ -31,8 +31,8 @@ import javax.jms.TopicSubscriber;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.test.JmsTopicSendReceiveTest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision: 1.5 $
@@ -41,7 +41,7 @@ public class JmsDurableTopicSlowReceiveT
     
     static final int NMSG = 200;
     static final int MSIZE = 256000;
-    private static final transient Log LOG = LogFactory.getLog(JmsDurableTopicSlowReceiveTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(JmsDurableTopicSlowReceiveTest.class);
     private static final String COUNT_PROPERY_NAME = "count";
 
     protected Connection connection2;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsTimeoutTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsTimeoutTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsTimeoutTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/JmsTimeoutTest.java Thu Feb 10 14:24:01 2011
@@ -31,13 +31,13 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.EmbeddedBrokerTestSupport;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.transport.RequestTimedOutIOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class JmsTimeoutTest extends EmbeddedBrokerTestSupport {
 
-		static final Log LOG = LogFactory.getLog(JmsTimeoutTest.class);
+		static final Logger LOG = LoggerFactory.getLogger(JmsTimeoutTest.class);
 	
 		private int messageSize=1024*64;
 		private int messageCount=10000;
@@ -152,4 +152,4 @@ public class JmsTimeoutTest extends Embe
 	        return buffer.toString();
 	    }
 	    
-	}
\ No newline at end of file
+	}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/MissingDataFileTest.java Thu Feb 10 14:24:01 2011
@@ -29,8 +29,8 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
 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;
 
 /*
  * Try and replicate:
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
 
 public class MissingDataFileTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(MissingDataFileTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MissingDataFileTest.class);
     
     private static int counter = 300;
 
@@ -252,7 +252,7 @@ public class MissingDataFileTest extends
                 try {
                     lock.wait(200);
                 } catch (InterruptedException e) {
-                    LOG.error(e);
+                    LOG.error(e.toString());
                 }
                 // check if all messages have been received
                 hasMessages = hectorToHaloCtr < counter || xenaToHaloCtr < counter || troyToHaloCtr < counter || haloToHectorCtr < counter || haloToXenaCtr < counter

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/OutOfOrderTestCase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/OutOfOrderTestCase.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/OutOfOrderTestCase.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/OutOfOrderTestCase.java Thu Feb 10 14:24:01 2011
@@ -31,12 +31,12 @@ import junit.framework.TestCase;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class OutOfOrderTestCase extends TestCase {
 	
-	private static final Log log = LogFactory.getLog(OutOfOrderTestCase.class);
+	private static final Logger log = LoggerFactory.getLogger(OutOfOrderTestCase.class);
 	
 	public static final String BROKER_URL = "tcp://localhost:61616";
 	private static final int PREFETCH = 10;
@@ -129,4 +129,4 @@ public class OutOfOrderTestCase extends 
 	private static String createMessageText(final int index) {
 		return "message #" + index;
 	}
-}
\ No newline at end of file
+}

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/QueueWorkerPrefetchTest.java Thu Feb 10 14:24:01 2011
@@ -37,15 +37,15 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.ActiveMQPrefetchPolicy;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test case demonstrating situation where messages are not delivered to consumers.
  */
 public class QueueWorkerPrefetchTest extends TestCase implements MessageListener
 {
-	 private static final Log LOG = LogFactory.getLog(QueueWorkerPrefetchTest.class);
+	 private static final Logger LOG = LoggerFactory.getLogger(QueueWorkerPrefetchTest.class);
     private static final int BATCH_SIZE = 10;
     private static final long WAIT_TIMEOUT = 1000*10;
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/SlowConsumerTest.java Thu Feb 10 14:24:01 2011
@@ -33,12 +33,12 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 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 class SlowConsumerTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(SlowConsumerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SlowConsumerTest.class);
     private static final int MESSAGES_COUNT = 10000;
 
     protected int messageLogFrequency = 2500;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TempStorageBlockedBrokerTest.java Thu Feb 10 14:24:01 2011
@@ -43,8 +43,8 @@ import org.apache.activemq.usage.StoreUs
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.usage.TempUsage;
 import org.apache.activemq.util.IOHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,7 +54,7 @@ public class TempStorageBlockedBrokerTes
     public boolean consumeAll = false;
     public int deliveryMode = DeliveryMode.PERSISTENT;
 
-    private static final Log LOG = LogFactory.getLog(TempStorageBlockedBrokerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TempStorageBlockedBrokerTest.class);
     private static final int MESSAGES_COUNT = 1000;
     private static byte[] buf = new byte[4 * 1024];
     private BrokerService broker;

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java Thu Feb 10 14:24:01 2011
@@ -27,8 +27,8 @@ import javax.jms.Session;
 import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /*
  * simulate message flow which cause the following exception in the broker
@@ -42,7 +42,7 @@ import org.apache.commons.logging.LogFac
  */
 public class TransactionNotStartedErrorTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(TransactionNotStartedErrorTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TransactionNotStartedErrorTest.class);
     
     private static int counter = 500;
 
@@ -223,7 +223,7 @@ public class TransactionNotStartedErrorT
                 try {
                     lock.wait(200);
                 } catch (InterruptedException e) {
-                    LOG.error(e);
+                    LOG.error(e.toString());
                 }
                 // check if all messages have been received
                 hasMessages = hectorToHaloCtr < counter || xenaToHaloCtr < counter || troyToHaloCtr < counter || haloToHectorCtr < counter || haloToXenaCtr < counter

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/VerifySteadyEnqueueRate.java Thu Feb 10 14:24:01 2011
@@ -32,13 +32,12 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.store.amq.AMQPersistenceAdapterFactory;
 import org.apache.activemq.store.kahadb.KahaDBStore;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class VerifySteadyEnqueueRate extends TestCase {
 
-    private static final Log LOG = LogFactory
-            .getLog(VerifySteadyEnqueueRate.class);
+    private static final Logger LOG = LoggerFactory.getLogger(VerifySteadyEnqueueRate.class);
 
     private static int max_messages = 1000000;
     private String destinationName = getName() + "_Queue";

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMapMessageTest.java Thu Feb 10 14:24:01 2011
@@ -29,14 +29,14 @@ import javax.jms.MessageNotReadableExcep
 import javax.jms.MessageNotWriteableException;
 
 import junit.framework.TestCase;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public class ActiveMQMapMessageTest extends TestCase {
-    private static final Log LOG = LogFactory.getLog(ActiveMQMapMessageTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQMapMessageTest.class);
 
     private String name = "testName";
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java Thu Feb 10 14:24:01 2011
@@ -31,15 +31,15 @@ import org.apache.activemq.openwire.Open
 import org.apache.activemq.state.CommandVisitor;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.wireformat.WireFormat;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public class ActiveMQMessageTest extends TestCase {
 
-    private static final Log LOG = LogFactory.getLog(ActiveMQMessageTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQMessageTest.class);
 
     protected boolean readOnlyMessage;
 

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/MessageSendTest.java Thu Feb 10 14:24:01 2011
@@ -22,11 +22,11 @@ import junit.framework.Test;
 
 import org.apache.activemq.JmsQueueSendReceiveTwoConnectionsStartBeforeBrokerTest;
 import org.apache.activemq.util.ByteSequence;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MessageSendTest extends DataStructureTestSupport {
-    private static final Log LOG = LogFactory.getLog(MessageSendTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MessageSendTest.class);
 
     public static Test suite() {
         return suite(MessageSendTest.class);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java Thu Feb 10 14:24:01 2011
@@ -22,14 +22,14 @@ import org.apache.activemq.ActiveMQConne
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerRegistry;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Revision$
  */
 public class BrokerPropertiesTest extends TestCase {
-    private static final transient Log LOG = LogFactory.getLog(BrokerPropertiesTest.class);
+    private static final transient Logger LOG = LoggerFactory.getLogger(BrokerPropertiesTest.class);
     
     public void testPropertiesFile() throws Exception {
         BrokerService broker = BrokerFactory.createBroker("properties:org/apache/activemq/config/broker.properties");

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java?rev=1069405&r1=1069404&r2=1069405&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/config/ConfigTest.java Thu Feb 10 14:24:01 2011
@@ -47,8 +47,8 @@ import org.apache.activemq.transport.tcp
 import org.apache.activemq.usage.SystemUsage;
 import org.apache.activemq.wireformat.ObjectStreamWireFormat;
 import org.apache.activemq.xbean.BrokerFactoryBean;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.derby.jdbc.EmbeddedDataSource;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
@@ -64,7 +64,7 @@ public class ConfigTest extends TestCase
     protected static final String JOURNAL_ROOT = "target/test-data/";
     protected static final String DERBY_ROOT = "target/test-data/";
     protected static final String CONF_ROOT = "src/test/resources/org/apache/activemq/config/sample-conf/";
-    private static final Log LOG = LogFactory.getLog(ConfigTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConfigTest.class);
 
     static {
         System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");



Mime
View raw message