QPID-2836 : [Java Broker] Use slf4j facade for logging in the Java Broker

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666234 13f79535-47bb-0310-9956-ffa450edef68

21 files changed, 148 insertions, 122 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
index 2e3626eae6..e125ddb772 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
@@ -51,14 +51,16 @@ import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManagerFactory;
 import javax.servlet.http.HttpServletResponse;
 
-import org.junit.Assert;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
+import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Binding;
@@ -75,7 +77,7 @@ public class RestTestHelper
     };
     public static final String API_BASE = "/api/latest/";
 
-    private static final Logger LOGGER = Logger.getLogger(RestTestHelper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(RestTestHelper.class);
     private static final String CERT_ALIAS_APP1 = "app1";
 
     private int _httpPort;
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
index 9e8f0d1ca2..4965f54403 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
@@ -25,7 +25,8 @@ import java.util.Set;
 
 import javax.security.auth.Subject;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.Broker;
 import org.apache.qpid.server.BrokerOptions;
@@ -34,7 +35,7 @@ import org.apache.qpid.server.util.Action;
 
 public class InternalBrokerHolder implements BrokerHolder
 {
-    private static final Logger LOGGER = Logger.getLogger(InternalBrokerHolder.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(InternalBrokerHolder.class);
 
     private Broker _broker;
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
index 12be233c35..98e3c96c0a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/Piper.java
@@ -24,15 +24,15 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.PrintStream;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class Piper extends Thread
 {
-    private static final Logger LOGGER = Logger.getLogger(Piper.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Piper.class);
 
     private final BufferedReader _in;
     private final Logger _out;
@@ -46,7 +46,7 @@ public final class Piper extends Thread
     {
         super(threadName);
         _in = new BufferedReader(new InputStreamReader(in));
-        _out = Logger.getLogger(loggerName);
+        _out = LoggerFactory.getLogger(loggerName);
         _ready = ready;
         _stopped = stopped;
         _seenReady = false;
@@ -117,4 +117,4 @@ public final class Piper extends Thread
     {
         return _ready;
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
index 2581093f97..cd436b98cf 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
@@ -33,7 +33,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.messages.BrokerMessages;
@@ -42,7 +44,7 @@ import org.apache.qpid.util.SystemUtils;
 
 public class SpawnedBrokerHolder implements BrokerHolder
 {
-    private static final Logger LOGGER = Logger.getLogger(SpawnedBrokerHolder.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpawnedBrokerHolder.class);
     protected static final String BROKER_READY = System.getProperty("broker.ready", BrokerMessages.READY().toString());
     private static final String BROKER_STOPPED = System.getProperty("broker.stopped", BrokerMessages.STOPPED().toString());
 
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
index 549edcd650..a091d01661 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
@@ -38,8 +38,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
-
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.logging.EventLogger;
@@ -60,7 +58,6 @@ import org.apache.qpid.util.Strings;
 
 public class TestBrokerConfiguration
 {
-    private static final Logger LOGGER = Logger.getLogger(TestBrokerConfiguration.class);
 
     public static final String ENTRY_NAME_HTTP_PORT = "http";
     public static final String ENTRY_NAME_AMQP_PORT = "amqp";
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java
index 6612fedd35..4b7c7b83b3 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/HeartbeatTest.java
@@ -29,13 +29,15 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 public class HeartbeatTest extends QpidBrokerTestCase
 {
-    private static final Logger LOGGER = Logger.getLogger(HeartbeatTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(HeartbeatTest.class);
 
     private static final String CONNECTION_URL_WITH_HEARTBEAT = "amqp://guest:guest@clientid/?brokerlist='localhost:%d?heartbeat='%d''";
     private TestListener _listener = new TestListener("listener");
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
index c59b0ecf34..8647333f2e 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/client/failover/MultipleBrokersFailoverTest.java
@@ -33,7 +33,9 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.jms.ConnectionListener;
@@ -42,7 +44,7 @@ import org.apache.qpid.util.FileUtils;
 
 public class MultipleBrokersFailoverTest extends QpidBrokerTestCase implements ConnectionListener
 {
-    private static final Logger _logger = Logger.getLogger(MultipleBrokersFailoverTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(MultipleBrokersFailoverTest.class);
 
     private static final String FAILOVER_VIRTUAL_HOST = "failover";
     private static final String NON_FAILOVER_VIRTUAL_HOST = "nonfailover";
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java
index daee2842fa..0b2b001a5f 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/ra/QpidRAConnectionTest.java
@@ -25,13 +25,14 @@ import javax.jms.ConnectionFactory;
 import javax.jms.Message;
 import javax.jms.Session;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 public class QpidRAConnectionTest extends QpidBrokerTestCase
 {
-    private static final Logger _logger = Logger.getLogger(QpidRAConnectionTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(QpidRAConnectionTest.class);
 
     private static final String BROKER_PORT = "15672";
 
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 9f145cd62c..8f21bd40ef 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -21,36 +21,37 @@
 
 package org.apache.qpid.server.exchange;
 
-import org.apache.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.jms.Connection;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.client.AMQHeadersExchange;
 import org.apache.qpid.client.AMQNoRouteException;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
-import org.apache.qpid.configuration.ClientProperties;
 import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 import org.apache.qpid.url.AMQBindingURL;
 import org.apache.qpid.url.BindingURL;
 
-import javax.jms.Connection;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase implements ExceptionListener
 {
-    private static final Logger _logger = Logger.getLogger(ReturnUnroutableMandatoryMessageTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(ReturnUnroutableMandatoryMessageTest.class);
 
     private final List<Message> _bouncedMessageList = Collections.synchronizedList(new ArrayList<Message>());
 
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
index dc30c02951..0cc079bba4 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
@@ -21,15 +21,13 @@
 
 package org.apache.qpid.server.queue;
 
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-import org.apache.qpid.url.AMQBindingURL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -39,17 +37,21 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import org.apache.qpid.url.AMQBindingURL;
 
 public class LastValueQueueTest extends QpidBrokerTestCase
 {
-    private static final Logger LOGGER = Logger.getLogger(LastValueQueueTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LastValueQueueTest.class);
 
     private static final String MESSAGE_SEQUENCE_NUMBER_PROPERTY = "msg";
     private static final String KEY_PROPERTY = "key";
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
index cbf4e032db..f074a6e723 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
@@ -20,9 +20,9 @@
  */
 package org.apache.qpid.server.queue;
 
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -31,13 +31,14 @@ import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 import javax.jms.Session;
 
-import java.util.Random;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase
 {
-    private static final Logger _logger = Logger.getLogger(MultipleTransactedBatchProducerTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(MultipleTransactedBatchProducerTest.class);
 
     private static final int MESSAGE_COUNT = 1000;
     private static final int BATCH_SIZE = 50;
@@ -247,4 +248,4 @@ public class MultipleTransactedBatchProducerTest extends QpidBrokerTestCase
         _logger.error("Failing test because: " + msg);
         _failMsg = msg;
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
index 7b2dd3239d..670fe95b8c 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
@@ -20,14 +20,10 @@
 */
 package org.apache.qpid.server.queue;
 
-import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -38,10 +34,17 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.naming.NamingException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.configuration.ClientProperties;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 public class PriorityQueueTest extends QpidBrokerTestCase
 {
@@ -247,7 +250,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase
 
     private static class ReflectingMessageListener implements MessageListener
     {
-        private static final Logger _logger = Logger.getLogger(PriorityQueueTest.ReflectingMessageListener.class);
+        private static final Logger _logger = LoggerFactory.getLogger(PriorityQueueTest.ReflectingMessageListener.class);
 
         private Session _prodSess;
         private Session _consSess;
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
index 427508954d..d6b943b768 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
@@ -37,7 +37,9 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
@@ -48,7 +50,7 @@ import org.apache.qpid.test.utils.JMXTestUtils;
 
 public class ProducerFlowControlTest extends AbstractTestLogging
 {
-    private static final Logger _logger = Logger.getLogger(ProducerFlowControlTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(ProducerFlowControlTest.class);
 
     private static final int TIMEOUT = 10000;
 
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
index 340ae4a1ae..92a0edc31b 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
@@ -19,15 +19,12 @@
  */
 package org.apache.qpid.server.queue;
 
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.AMQException;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -38,16 +35,21 @@ import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.naming.NamingException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.configuration.ClientProperties;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 public class SortedQueueTest extends QpidBrokerTestCase
 {
-    private static final Logger LOGGER = Logger.getLogger(SortedQueueTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(SortedQueueTest.class);
     public static final String TEST_SORT_KEY = "testSortKey";
     private static final String[] VALUES = SortedQueueEntryListTest.keys.clone();
     private static final String[] VALUES_SORTED = SortedQueueEntryListTest.keys.clone();
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
index e606df3f7d..64292a8fa9 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/TimeToLiveTest.java
@@ -34,8 +34,9 @@ import javax.jms.Session;
 import javax.jms.TopicSubscriber;
 import javax.naming.NamingException;
 
-import org.apache.log4j.Logger;
 import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
@@ -46,7 +47,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 public class TimeToLiveTest extends QpidBrokerTestCase
 {
-    private static final Logger _logger = Logger.getLogger(TimeToLiveTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(TimeToLiveTest.class);
 
     protected final String QUEUE = "TimeToLiveQueue";
 
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
index d0f133aa73..1e09eea07b 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
@@ -48,7 +48,8 @@ import javax.management.openmbean.TabularData;
 import javax.naming.NamingException;
 
 import org.apache.commons.lang.time.FastDateFormat;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.configuration.ClientProperties;
@@ -69,7 +70,7 @@ import org.apache.qpid.test.utils.QpidBrokerTestCase;
 public class QueueManagementTest extends QpidBrokerTestCase
 {
 
-    private static final Logger LOGGER = Logger.getLogger(QueueManagementTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(QueueManagementTest.class);
 
     private static final String VIRTUAL_HOST = "test";
     private static final String TEST_QUEUE_DESCRIPTION = "my description";
@@ -328,8 +329,6 @@ public class QueueManagementTest extends QpidBrokerTestCase
      * Tests the ability to receive queue alerts as JMX notifications.
      *
      * @see NotificationCheckTest
-     * @see SimpleAMQQueueTest#testNotificationFiredAsync()
-     * @see SimpleAMQQueueTest#testNotificationFiredOnEnqueue()
      */
     public void testQueueNotification() throws Exception
     {
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
index deb8e4f12b..d2416f641a 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/CloseOnNoRouteForMandatoryMessageTest.java
@@ -30,7 +30,9 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.naming.NamingException;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
@@ -48,7 +50,7 @@ import org.apache.qpid.url.URLSyntaxException;
  */
 public class CloseOnNoRouteForMandatoryMessageTest extends QpidBrokerTestCase
 {
-    private static final Logger _logger = Logger.getLogger(CloseOnNoRouteForMandatoryMessageTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(CloseOnNoRouteForMandatoryMessageTest.class);
 
     private Connection _connection;
     private UnroutableMessageTestExceptionListener _testExceptionListener = new UnroutableMessageTestExceptionListener();
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java
index f8bc051be7..dc84617e17 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/FlowControlTest.java
@@ -20,12 +20,6 @@
 */
 package org.apache.qpid.test.client;
 
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.client.AMQSession_0_8;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
-
 import javax.jms.BytesMessage;
 import javax.jms.Connection;
 import javax.jms.Message;
@@ -34,9 +28,16 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.client.AMQSession_0_8;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
+
 public class FlowControlTest extends QpidBrokerTestCase
 {
-    private static final Logger _logger = Logger.getLogger(FlowControlTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(FlowControlTest.class);
 
     private Connection _clientConnection;
     private Session _clientSession;
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
index 99afe0015d..50198a0c66 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
@@ -32,7 +32,9 @@ import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
 import javax.jms.Message;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQNoConsumersException;
 import org.apache.qpid.client.AMQNoRouteException;
@@ -49,7 +51,7 @@ import org.apache.qpid.protocol.AMQConstant;
  */
 public class UnroutableMessageTestExceptionListener implements ExceptionListener
 {
-    private static final Logger _logger = Logger.getLogger(UnroutableMessageTestExceptionListener.class);
+    private static final Logger _logger = LoggerFactory.getLogger(UnroutableMessageTestExceptionListener.class);
 
     /**
      * Number of seconds to check for an event that should should NOT happen
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
index 2875e2c6b1..43bd540d8e 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/client/failover/FailoverTest.java
@@ -21,12 +21,9 @@
 
 package org.apache.qpid.test.client.failover;
 
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.jms.ConnectionListener;
-import org.apache.qpid.test.utils.FailoverBaseCase;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -36,13 +33,18 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 import javax.jms.TextMessage;
-import java.util.Random;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.test.utils.FailoverBaseCase;
 
 public class FailoverTest extends FailoverBaseCase implements ConnectionListener
 {
-    private static final Logger _logger = Logger.getLogger(FailoverTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(FailoverTest.class);
 
     private static final int DEFAULT_NUM_MESSAGES = 10;
     private static final int DEFAULT_SEED = 20080921;
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
index 5e1e38106a..cf7e378e44 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
@@ -37,7 +37,8 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQDestination;
@@ -64,7 +65,7 @@ import org.apache.qpid.test.utils.TestBrokerConfiguration;
  */
 public class MaxDeliveryCountTest extends QpidBrokerTestCase
 {
-    private static final Logger _logger = Logger.getLogger(MaxDeliveryCountTest.class);
+    private static final Logger _logger = LoggerFactory.getLogger(MaxDeliveryCountTest.class);
     private boolean _failed;
     private String _failMsg;
     private static final int MSG_COUNT = 15;