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

79 files changed, 361 insertions, 288 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
index bf45268a5e..06d58eb11c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
@@ -28,7 +28,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.Broker;
@@ -50,7 +51,7 @@ import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
 
 public class ManagementModeStoreHandler implements DurableConfigurationStore
 {
-    private static final Logger LOGGER = Logger.getLogger(ManagementModeStoreHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ManagementModeStoreHandler.class);
 
     private static final String MANAGEMENT_MODE_PORT_PREFIX = "MANAGEMENT-MODE-PORT-";
     private static final String PORT_TYPE = Port.class.getSimpleName();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
index 0f59494850..5c10d6f7ac 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java
@@ -37,14 +37,15 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.security.auth.Subject;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
 public class TaskExecutorImpl implements TaskExecutor
 {
     private static final String TASK_EXECUTION_THREAD_NAME = "Broker-Configuration-Thread";
-    private static final Logger LOGGER = Logger.getLogger(TaskExecutorImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TaskExecutorImpl.class);
 
     private volatile Thread _taskThread;
     private final AtomicBoolean _running = new AtomicBoolean();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
index a24195075e..460a1c207d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
@@ -29,14 +29,15 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.protocol.AMQConnectionModel;
 
 public class ConnectionRegistry implements IConnectionRegistry
 {
-    private Logger _logger = Logger.getLogger(ConnectionRegistry.class);
+    private Logger _logger = LoggerFactory.getLogger(ConnectionRegistry.class);
 
     private final Set<AMQConnectionModel> _registry = newSetFromMap(new ConcurrentHashMap<AMQConnectionModel, Boolean>());
     private final Collection<RegistryChangeListener> _listeners = new ArrayList<>();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
index be4ac9d427..321f8b28e6 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
@@ -30,14 +30,16 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.message.MessageInstance;
 import org.apache.qpid.server.util.StateChangeListener;
 
 public abstract class AbstractConsumerTarget implements ConsumerTarget
 {
-    private static final Logger LOGGER = Logger.getLogger(AbstractConsumerTarget.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractConsumerTarget.class);
     private final AtomicReference<State> _state;
 
     private final Set<StateChangeListener<ConsumerTarget, State>> _stateChangeListeners = new
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index 61bbe6f732..ac623bc337 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -41,7 +41,8 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.BindingImpl;
@@ -79,7 +80,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
         extends AbstractConfiguredObject<T>
         implements ExchangeImpl<T>
 {
-    private static final Logger _logger = Logger.getLogger(AbstractExchange.class);
+    private static final Logger _logger = LoggerFactory.getLogger(AbstractExchange.class);
     private final AtomicBoolean _closed = new AtomicBoolean();
 
     @ManagedAttributeField(beforeSet = "preSetAlternateExchange", afterSet = "postSetAlternateExchange" )
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
index fcc34ee4de..7cf1963331 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DefaultDestination.java
@@ -18,7 +18,6 @@
  */
 package org.apache.qpid.server.exchange;
 
-import org.apache.log4j.Logger;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.message.InstanceProperties;
 import org.apache.qpid.server.message.MessageDestination;
@@ -35,7 +34,6 @@ public class DefaultDestination implements MessageDestination
 {
 
     private VirtualHostImpl _virtualHost;
-    private static final Logger _logger = Logger.getLogger(DefaultDestination.class);
 
     public DefaultDestination(VirtualHostImpl virtualHost)
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
index 66de22ece8..fa8b52db55 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
@@ -31,7 +31,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.BindingImpl;
@@ -51,7 +52,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 public class DirectExchange extends AbstractExchange<DirectExchange>
 {
 
-    private static final Logger _logger = Logger.getLogger(DirectExchange.class);
+    private static final Logger _logger = LoggerFactory.getLogger(DirectExchange.class);
 
     private static final class BindingSet
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
index a72cbd6396..a7265526fe 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
@@ -27,7 +27,8 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.BindingImpl;
@@ -46,7 +47,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 @ManagedObject( category = false, type = ExchangeDefaults.FANOUT_EXCHANGE_CLASS )
 public class FanoutExchange extends AbstractExchange<FanoutExchange>
 {
-    private static final Logger _logger = Logger.getLogger(FanoutExchange.class);
+    private static final Logger _logger = LoggerFactory.getLogger(FanoutExchange.class);
 
     private static final Integer ONE = Integer.valueOf(1);
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index de796a846a..4329e2e003 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
@@ -26,7 +26,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.binding.BindingImpl;
 import org.apache.qpid.server.filter.AMQInvalidArgumentException;
@@ -40,7 +41,7 @@ import org.apache.qpid.server.message.AMQMessageHeader;
  */
 class HeadersBinding
 {
-    private static final Logger _logger = Logger.getLogger(HeadersBinding.class);
+    private static final Logger _logger = LoggerFactory.getLogger(HeadersBinding.class);
 
     private final Map<String,Object> _mappings;
     private final BindingImpl _binding;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
index a5c74cb286..5130423ac9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
@@ -29,7 +29,8 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.BindingImpl;
@@ -73,7 +74,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 public class HeadersExchange extends AbstractExchange<HeadersExchange>
 {
 
-    private static final Logger _logger = Logger.getLogger(HeadersExchange.class);
+    private static final Logger _logger = LoggerFactory.getLogger(HeadersExchange.class);
 
     private final ConcurrentMap<String, CopyOnWriteArraySet<BindingImpl>> _bindingsByKey =
                             new ConcurrentHashMap<String, CopyOnWriteArraySet<BindingImpl>>();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
index 3e5d7dedb4..2cc2930fcb 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
@@ -28,7 +28,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.BindingImpl;
@@ -51,7 +52,7 @@ import org.apache.qpid.server.virtualhost.VirtualHostImpl;
 @ManagedObject( category = false, type = ExchangeDefaults.TOPIC_EXCHANGE_CLASS )
 public class TopicExchange extends AbstractExchange<TopicExchange>
 {
-    private static final Logger _logger = Logger.getLogger(TopicExchange.class);
+    private static final Logger _logger = LoggerFactory.getLogger(TopicExchange.class);
 
     private final TopicParser _parser = new TopicParser();
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
index 28f7fe3554..85ba7002e3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.filter;
 
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.filter.SelectorParsingException;
@@ -33,7 +34,7 @@ import org.apache.qpid.filter.selector.TokenMgrError;
 public class FilterManagerFactory
 {
 
-    private final static Logger _logger = Logger.getLogger(FilterManagerFactory.class);
+    private final static Logger _logger = LoggerFactory.getLogger(FilterManagerFactory.class);
 
     private FilterManagerFactory()
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
index a36049cd23..5a08eb3a0f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
@@ -24,7 +24,8 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.filter.BooleanExpression;
@@ -39,7 +40,7 @@ import org.apache.qpid.server.plugin.PluggableService;
 @PluggableService
 public class JMSSelectorFilter implements MessageFilter
 {
-    private final static Logger _logger = org.apache.log4j.Logger.getLogger(JMSSelectorFilter.class);
+    private final static Logger _logger = LoggerFactory.getLogger(JMSSelectorFilter.class);
 
     private String _selector;
     private BooleanExpression _matcher;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
index 3149386b98..478c8545a1 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/Log4jMessageLogger.java
@@ -20,7 +20,8 @@
  */
 package org.apache.qpid.server.logging;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Log4jMessageLogger extends AbstractMessageLogger
 {
@@ -39,7 +40,7 @@ public class Log4jMessageLogger extends AbstractMessageLogger
     {
         if(isEnabled())
         {
-            Logger logger = Logger.getLogger(logHierarchy);
+            Logger logger = LoggerFactory.getLogger(logHierarchy);
             return logger.isInfoEnabled();
         }
         else
@@ -57,7 +58,7 @@ public class Log4jMessageLogger extends AbstractMessageLogger
     @Override
     void rawMessage(String message, Throwable throwable, String logHierarchy)
     {
-        Logger logger = Logger.getLogger(logHierarchy);
+        Logger logger = LoggerFactory.getLogger(logHierarchy);
         logger.info(message, throwable);
     }
 }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
index efda825aeb..290f9d4028 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -49,9 +50,9 @@ public class AccessControlMessages
 
     static
     {
-        Logger.getLogger(ACCESSCONTROL_LOG_HIERARCHY);
-        Logger.getLogger(DENIED_LOG_HIERARCHY);
-        Logger.getLogger(ALLOWED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(ACCESSCONTROL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DENIED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(ALLOWED_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.AccessControl_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
index a4c73f3b88..dc328b6d19 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -49,9 +50,9 @@ public class BindingMessages
 
     static
     {
-        Logger.getLogger(BINDING_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(DELETED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(BINDING_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETED_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Binding_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
index 58f7dfe807..8d28583d1c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -63,23 +64,23 @@ public class BrokerMessages
 
     static
     {
-        Logger.getLogger(BROKER_LOG_HIERARCHY);
-        Logger.getLogger(LOG_CONFIG_LOG_HIERARCHY);
-        Logger.getLogger(CONFIG_LOG_HIERARCHY);
-        Logger.getLogger(STATS_DATA_LOG_HIERARCHY);
-        Logger.getLogger(STOPPED_LOG_HIERARCHY);
-        Logger.getLogger(STATS_MSGS_LOG_HIERARCHY);
-        Logger.getLogger(LISTENING_LOG_HIERARCHY);
-        Logger.getLogger(FLOW_TO_DISK_INACTIVE_LOG_HIERARCHY);
-        Logger.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY);
-        Logger.getLogger(MAX_MEMORY_LOG_HIERARCHY);
-        Logger.getLogger(PLATFORM_LOG_HIERARCHY);
-        Logger.getLogger(PROCESS_LOG_HIERARCHY);
-        Logger.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
-        Logger.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY);
-        Logger.getLogger(STARTUP_LOG_HIERARCHY);
-        Logger.getLogger(FATAL_ERROR_LOG_HIERARCHY);
-        Logger.getLogger(READY_LOG_HIERARCHY);
+        LoggerFactory.getLogger(BROKER_LOG_HIERARCHY);
+        LoggerFactory.getLogger(LOG_CONFIG_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CONFIG_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STATS_DATA_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY);
+        LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FLOW_TO_DISK_INACTIVE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(MAX_MEMORY_LOG_HIERARCHY);
+        LoggerFactory.getLogger(PLATFORM_LOG_HIERARCHY);
+        LoggerFactory.getLogger(PROCESS_LOG_HIERARCHY);
+        LoggerFactory.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STARTUP_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FATAL_ERROR_LOG_HIERARCHY);
+        LoggerFactory.getLogger(READY_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Broker_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
index c112dd4292..3ab9b1b453 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -61,21 +62,21 @@ public class ChannelMessages
 
     static
     {
-        Logger.getLogger(CHANNEL_LOG_HIERARCHY);
-        Logger.getLogger(FLOW_ENFORCED_LOG_HIERARCHY);
-        Logger.getLogger(CREATE_LOG_HIERARCHY);
-        Logger.getLogger(FLOW_LOG_HIERARCHY);
-        Logger.getLogger(CLOSE_LOG_HIERARCHY);
-        Logger.getLogger(PREFETCH_SIZE_LOG_HIERARCHY);
-        Logger.getLogger(CLOSE_FORCED_LOG_HIERARCHY);
-        Logger.getLogger(LARGE_TRANSACTION_WARN_LOG_HIERARCHY);
-        Logger.getLogger(DEADLETTERMSG_LOG_HIERARCHY);
-        Logger.getLogger(DISCARDMSG_NOALTEXCH_LOG_HIERARCHY);
-        Logger.getLogger(IDLE_TXN_LOG_HIERARCHY);
-        Logger.getLogger(FLOW_CONTROL_IGNORED_LOG_HIERARCHY);
-        Logger.getLogger(DISCARDMSG_NOROUTE_LOG_HIERARCHY);
-        Logger.getLogger(OPEN_TXN_LOG_HIERARCHY);
-        Logger.getLogger(FLOW_REMOVED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CHANNEL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FLOW_ENFORCED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FLOW_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(PREFETCH_SIZE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_FORCED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(LARGE_TRANSACTION_WARN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DEADLETTERMSG_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DISCARDMSG_NOALTEXCH_LOG_HIERARCHY);
+        LoggerFactory.getLogger(IDLE_TXN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FLOW_CONTROL_IGNORED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DISCARDMSG_NOROUTE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OPEN_TXN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FLOW_REMOVED_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Channel_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
index f720ff6385..6b43e98b4e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -52,12 +53,12 @@ public class ConfigStoreMessages
 
     static
     {
-        Logger.getLogger(CONFIGSTORE_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
-        Logger.getLogger(CLOSE_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(STORE_LOCATION_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERY_START_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CONFIGSTORE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.ConfigStore_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
index 42c41849ab..d1d2d8ec80 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -51,11 +52,11 @@ public class ConnectionMessages
 
     static
     {
-        Logger.getLogger(CONNECTION_LOG_HIERARCHY);
-        Logger.getLogger(OPEN_LOG_HIERARCHY);
-        Logger.getLogger(DROPPED_CONNECTION_LOG_HIERARCHY);
-        Logger.getLogger(IDLE_CLOSE_LOG_HIERARCHY);
-        Logger.getLogger(CLOSE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CONNECTION_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DROPPED_CONNECTION_LOG_HIERARCHY);
+        LoggerFactory.getLogger(IDLE_CLOSE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Connection_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
index 5e5abaff96..6b45ce56d0 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -50,10 +51,10 @@ public class ExchangeMessages
 
     static
     {
-        Logger.getLogger(EXCHANGE_LOG_HIERARCHY);
-        Logger.getLogger(DISCARDMSG_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(DELETED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(EXCHANGE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DISCARDMSG_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETED_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Exchange_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
index ee29ef6796..b45bc65ba2 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -61,21 +62,21 @@ public class HighAvailabilityMessages
 
     static
     {
-        Logger.getLogger(HIGHAVAILABILITY_LOG_HIERARCHY);
-        Logger.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY);
-        Logger.getLogger(TRANSFER_MASTER_LOG_HIERARCHY);
-        Logger.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY);
-        Logger.getLogger(REMOVED_LOG_HIERARCHY);
-        Logger.getLogger(LEFT_LOG_HIERARCHY);
-        Logger.getLogger(JOINED_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(QUORUM_LOST_LOG_HIERARCHY);
-        Logger.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY);
-        Logger.getLogger(ADDED_LOG_HIERARCHY);
-        Logger.getLogger(DELETED_LOG_HIERARCHY);
-        Logger.getLogger(ROLE_CHANGED_LOG_HIERARCHY);
-        Logger.getLogger(DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY);
-        Logger.getLogger(NODE_ROLLEDBACK_LOG_HIERARCHY);
+        LoggerFactory.getLogger(HIGHAVAILABILITY_LOG_HIERARCHY);
+        LoggerFactory.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(TRANSFER_MASTER_LOG_HIERARCHY);
+        LoggerFactory.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(REMOVED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(LEFT_LOG_HIERARCHY);
+        LoggerFactory.getLogger(JOINED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(QUORUM_LOST_LOG_HIERARCHY);
+        LoggerFactory.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(ADDED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(ROLE_CHANGED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(NODE_ROLLEDBACK_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.HighAvailability_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
index 6c27b51ce0..a55671e001 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -54,14 +55,14 @@ public class ManagementConsoleMessages
 
     static
     {
-        Logger.getLogger(MANAGEMENTCONSOLE_LOG_HIERARCHY);
-        Logger.getLogger(OPEN_LOG_HIERARCHY);
-        Logger.getLogger(LISTENING_LOG_HIERARCHY);
-        Logger.getLogger(STOPPED_LOG_HIERARCHY);
-        Logger.getLogger(CLOSE_LOG_HIERARCHY);
-        Logger.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
-        Logger.getLogger(STARTUP_LOG_HIERARCHY);
-        Logger.getLogger(READY_LOG_HIERARCHY);
+        LoggerFactory.getLogger(MANAGEMENTCONSOLE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STARTUP_LOG_HIERARCHY);
+        LoggerFactory.getLogger(READY_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.ManagementConsole_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
index 7114c8532b..ef07401e25 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -56,16 +57,16 @@ public class MessageStoreMessages
 
     static
     {
-        Logger.getLogger(MESSAGESTORE_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
-        Logger.getLogger(CLOSED_LOG_HIERARCHY);
-        Logger.getLogger(OVERFULL_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERED_LOG_HIERARCHY);
-        Logger.getLogger(UNDERFULL_LOG_HIERARCHY);
-        Logger.getLogger(PASSIVATE_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(STORE_LOCATION_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERY_START_LOG_HIERARCHY);
+        LoggerFactory.getLogger(MESSAGESTORE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OVERFULL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(PASSIVATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.MessageStore_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
index d848008f0f..f7ecddb354 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -52,12 +53,12 @@ public class PortMessages
 
     static
     {
-        Logger.getLogger(PORT_LOG_HIERARCHY);
-        Logger.getLogger(OPEN_LOG_HIERARCHY);
-        Logger.getLogger(CREATE_LOG_HIERARCHY);
-        Logger.getLogger(CLOSE_LOG_HIERARCHY);
-        Logger.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY);
-        Logger.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(PORT_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Port_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
index b8f95dfc28..dfa17652bd 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -51,11 +52,11 @@ public class QueueMessages
 
     static
     {
-        Logger.getLogger(QUEUE_LOG_HIERARCHY);
-        Logger.getLogger(OVERFULL_LOG_HIERARCHY);
-        Logger.getLogger(UNDERFULL_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(DELETED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(QUEUE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OVERFULL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETED_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Queue_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
index 43c9754afa..b6e2ab6b62 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -50,10 +51,10 @@ public class SubscriptionMessages
 
     static
     {
-        Logger.getLogger(SUBSCRIPTION_LOG_HIERARCHY);
-        Logger.getLogger(STATE_LOG_HIERARCHY);
-        Logger.getLogger(CREATE_LOG_HIERARCHY);
-        Logger.getLogger(CLOSE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(SUBSCRIPTION_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Subscription_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
index 9e2f64ff39..9f24d120bc 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -55,15 +56,15 @@ public class TransactionLogMessages
 
     static
     {
-        Logger.getLogger(TRANSACTIONLOG_LOG_HIERARCHY);
-        Logger.getLogger(CLOSED_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
-        Logger.getLogger(XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY);
-        Logger.getLogger(XA_INCOMPLETE_QUEUE_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERED_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(STORE_LOCATION_LOG_HIERARCHY);
-        Logger.getLogger(RECOVERY_START_LOG_HIERARCHY);
+        LoggerFactory.getLogger(TRANSACTIONLOG_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(XA_INCOMPLETE_QUEUE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY);
+        LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.TransactionLog_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
index 7755b5ebc2..ddaa808abf 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
@@ -22,7 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -54,14 +55,14 @@ public class VirtualHostMessages
 
     static
     {
-        Logger.getLogger(VIRTUALHOST_LOG_HIERARCHY);
-        Logger.getLogger(CLOSED_LOG_HIERARCHY);
-        Logger.getLogger(STATS_DATA_LOG_HIERARCHY);
-        Logger.getLogger(STATS_MSGS_LOG_HIERARCHY);
-        Logger.getLogger(FILESYSTEM_FULL_LOG_HIERARCHY);
-        Logger.getLogger(FILESYSTEM_NOTFULL_LOG_HIERARCHY);
-        Logger.getLogger(CREATED_LOG_HIERARCHY);
-        Logger.getLogger(ERRORED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(VIRTUALHOST_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STATS_DATA_LOG_HIERARCHY);
+        LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FILESYSTEM_FULL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(FILESYSTEM_NOTFULL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
+        LoggerFactory.getLogger(ERRORED_LOG_HIERARCHY);
 
         _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.VirtualHost_logmessages", _currentLocale);
     }
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
index 529aa230d4..f9d51028f5 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
@@ -58,7 +58,6 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonProcessingException;
 import org.codehaus.jackson.Version;
@@ -67,6 +66,8 @@ import org.codehaus.jackson.map.Module;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializerProvider;
 import org.codehaus.jackson.map.module.SimpleModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.configuration.updater.Task;
@@ -85,7 +86,7 @@ import org.apache.qpid.util.Strings;
 
 public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> implements ConfiguredObject<X>
 {
-    private static final Logger LOGGER = Logger.getLogger(AbstractConfiguredObject.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractConfiguredObject.class);
 
     private static final Map<Class, Object> SECURE_VALUES;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
index 342b7ac0ba..c4f1e47d5e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
@@ -30,11 +30,12 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.regex.Pattern;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConfiguredAutomatedAttribute<C extends ConfiguredObject, T>  extends ConfiguredObjectAttribute<C,T>
 {
-    private static final Logger LOGGER = Logger.getLogger(ConfiguredAutomatedAttribute.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfiguredAutomatedAttribute.class);
 
     private final ManagedAttribute _annotation;
     private final Method _validValuesMethod;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
index a93e6a602f..1d6551e44e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObjectTypeRegistry.java
@@ -41,7 +41,8 @@ import java.util.TreeMap;
 import java.util.TreeSet;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.plugin.ConfiguredObjectRegistration;
 import org.apache.qpid.server.util.Action;
@@ -50,7 +51,7 @@ import org.apache.qpid.util.Strings;
 
 public class ConfiguredObjectTypeRegistry
 {
-    private static final Logger LOGGER = Logger.getLogger(ConfiguredObjectTypeRegistry.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfiguredObjectTypeRegistry.class);
 
     private static Map<String,Integer> STANDARD_FIRST_FIELDS_ORDER = new HashMap<>();
     static
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
index 036c4d7716..3b3ae59a1a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
@@ -38,7 +38,8 @@ import javax.security.auth.Subject;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.common.QpidProperties;
 import org.apache.qpid.server.BrokerOptions;
@@ -62,7 +63,7 @@ import org.apache.qpid.util.SystemUtils;
 
 public class BrokerAdapter extends AbstractConfiguredObject<BrokerAdapter> implements Broker<BrokerAdapter>, ConfigurationChangeListener, StatisticsGatherer
 {
-    private static final Logger LOGGER = Logger.getLogger(BrokerAdapter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BrokerAdapter.class);
 
     private static final Pattern MODEL_VERSION_PATTERN = Pattern.compile("^\\d+\\.\\d+$");
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
index 8bcbba9ac4..ef760ade6a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
@@ -29,7 +29,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
@@ -49,7 +50,7 @@ import org.apache.qpid.server.util.Action;
 public final class ConnectionAdapter extends AbstractConfiguredObject<ConnectionAdapter> implements Connection<ConnectionAdapter>,
                                                                                              SessionModelListener
 {
-    private static final Logger LOGGER = Logger.getLogger(ConnectionAdapter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionAdapter.class);
 
     private final Action _underlyingConnectionDeleteTask;
     private final AtomicBoolean _underlyingClosed = new AtomicBoolean(false);
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
index 1a119be32d..7c34adbaa0 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
@@ -34,7 +34,8 @@ import java.util.UUID;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -58,7 +59,7 @@ public class FileBasedGroupProviderImpl
         extends AbstractConfiguredObject<FileBasedGroupProviderImpl> implements FileBasedGroupProvider<FileBasedGroupProviderImpl>
 {
     public static final String GROUP_FILE_PROVIDER_TYPE = "GroupFile";
-    private static Logger LOGGER = Logger.getLogger(FileBasedGroupProviderImpl.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(FileBasedGroupProviderImpl.class);
 
     private final Broker<?> _broker;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
index 500df8cb87..f4420dc19c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderImpl.java
@@ -40,12 +40,14 @@ import java.util.TreeMap;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+
 import org.codehaus.jackson.JsonParser;
 import org.codehaus.jackson.JsonProcessingException;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
 import org.codehaus.jackson.type.TypeReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -63,7 +65,7 @@ import org.apache.qpid.server.util.FileHelper;
 public class FileSystemPreferencesProviderImpl
         extends AbstractConfiguredObject<FileSystemPreferencesProviderImpl> implements FileSystemPreferencesProvider<FileSystemPreferencesProviderImpl>
 {
-    private static final Logger LOGGER = Logger.getLogger(FileSystemPreferencesProviderImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemPreferencesProviderImpl.class);
 
     private final AuthenticationProvider<? extends AuthenticationProvider> _authenticationProvider;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
index 0e6f18a70a..44c8869308 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
@@ -30,7 +30,8 @@ import java.util.Set;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
@@ -48,7 +49,7 @@ import org.apache.qpid.server.model.TrustStore;
 
 abstract public class AbstractPort<X extends AbstractPort<X>> extends AbstractConfiguredObject<X> implements Port<X>
 {
-    private static final Logger LOGGER = Logger.getLogger(AbstractPort.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPort.class);
 
     private final Broker<?> _broker;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
index e6100efda7..c59e2285e3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/plugin/QpidServiceLoader.java
@@ -26,7 +26,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
@@ -35,7 +36,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
  */
 public class QpidServiceLoader
 {
-    private static final Logger _logger = Logger.getLogger(QpidServiceLoader.class);
+    private static final Logger _logger = LoggerFactory.getLogger(QpidServiceLoader.class);
 
     public <C extends Pluggable> Iterable<C> instancesOf(Class<C> clazz)
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
index 2ccf595c26..bf7835db1c 100755
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngine.java
@@ -30,7 +30,8 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import javax.security.auth.Subject;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.logging.messages.ConnectionMessages;
 import org.apache.qpid.server.model.Broker;
@@ -44,7 +45,7 @@ import org.apache.qpid.transport.network.NetworkConnection;
 
 public class MultiVersionProtocolEngine implements ServerProtocolEngine
 {
-    private static final Logger _logger = Logger.getLogger(MultiVersionProtocolEngine.class);
+    private static final Logger _logger = LoggerFactory.getLogger(MultiVersionProtocolEngine.class);
 
     private final long _id;
     private final AmqpPort<?> _port;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 2a51657f60..33b4d59878 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -45,7 +45,8 @@ import javax.security.auth.Subject;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.pool.ReferenceCountingExecutorService;
 import org.apache.qpid.server.binding.BindingImpl;
@@ -110,7 +111,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
                    MessageGroupManager.ConsumerResetHelper
 {
 
-    private static final Logger _logger = Logger.getLogger(AbstractQueue.class);
+    private static final Logger _logger = LoggerFactory.getLogger(AbstractQueue.class);
 
     public static final String SHARED_MSG_GROUP_ARG_VALUE = "1";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
index ac04912a72..68e60e0c0c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java
@@ -20,7 +20,9 @@
  */
 package org.apache.qpid.server.queue;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.model.QueueNotificationListener;
 
@@ -123,7 +125,7 @@ public enum NotificationCheck
     }
     ;
 
-    private static final Logger LOGGER = Logger.getLogger(NotificationCheck.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NotificationCheck.class);
 
     private final boolean _messageSpecific;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
index b409b638b3..d08319b5f9 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerImpl.java
@@ -32,8 +32,6 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.log4j.Logger;
-
 import org.apache.qpid.server.consumer.ConsumerTarget;
 import org.apache.qpid.server.filter.FilterManager;
 import org.apache.qpid.server.filter.JMSSelectorFilter;
@@ -59,8 +57,6 @@ class QueueConsumerImpl
         implements QueueConsumer<QueueConsumerImpl>, LogSubject
 {
 
-
-    private static final Logger _logger = Logger.getLogger(QueueConsumerImpl.class);
     private final AtomicBoolean _targetClosed = new AtomicBoolean(false);
     private final AtomicBoolean _closed = new AtomicBoolean(false);
     private final long _consumerNumber;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
index 917c951b6d..c798a1ff88 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
@@ -27,7 +27,8 @@ import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.consumer.ConsumerImpl;
 import org.apache.qpid.server.filter.Filterable;
@@ -44,7 +45,7 @@ import org.apache.qpid.server.util.StateChangeListener;
 
 public abstract class QueueEntryImpl implements QueueEntry
 {
-    private static final Logger _log = Logger.getLogger(QueueEntryImpl.class);
+    private static final Logger _log = LoggerFactory.getLogger(QueueEntryImpl.class);
 
     private final QueueEntryList _queueEntryList;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
index e784126d24..0776439cbf 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
@@ -27,7 +27,8 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import javax.security.auth.Subject;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.security.SecurityManager;
 import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
@@ -41,7 +42,7 @@ import org.apache.qpid.transport.TransportException;
  */
 public class QueueRunner implements Runnable
 {
-    private static final Logger _logger = Logger.getLogger(QueueRunner.class);
+    private static final Logger _logger = LoggerFactory.getLogger(QueueRunner.class);
 
     private final AbstractQueue _queue;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
index ea6a0394f0..acec47a76a 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
@@ -58,7 +58,8 @@ import javax.xml.bind.DatatypeConverter;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
@@ -76,7 +77,7 @@ import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
 @ManagedObject( category = false )
 public class NonJavaKeyStoreImpl extends AbstractConfiguredObject<NonJavaKeyStoreImpl> implements NonJavaKeyStore<NonJavaKeyStoreImpl>
 {
-    private static final Logger LOGGER = Logger.getLogger(NonJavaKeyStoreImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NonJavaKeyStoreImpl.class);
 
     private final Broker<?> _broker;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
index c18189785d..a47fe28e3c 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
@@ -46,7 +46,8 @@ import javax.security.auth.x500.X500Principal;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
@@ -68,7 +69,7 @@ import org.apache.qpid.server.util.urlstreamhandler.data.Handler;
 public class NonJavaTrustStoreImpl
         extends AbstractConfiguredObject<NonJavaTrustStoreImpl> implements NonJavaTrustStore<NonJavaTrustStoreImpl>
 {
-    private static final Logger LOGGER = Logger.getLogger(NonJavaTrustStoreImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(NonJavaTrustStoreImpl.class);
 
     private final Broker<?> _broker;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
index 2c692ddf4d..623be11c21 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/AbstractPasswordFilePrincipalDatabase.java
@@ -20,13 +20,6 @@
  */
 package org.apache.qpid.server.security.auth.database;
 
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.util.BaseAction;
-import org.apache.qpid.server.util.FileHelper;
-
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.AccountNotFoundException;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -41,6 +34,15 @@ import java.util.Map;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
+import javax.security.auth.callback.PasswordCallback;
+import javax.security.auth.login.AccountNotFoundException;
+
+import org.slf4j.Logger;
+
+import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.server.util.BaseAction;
+import org.apache.qpid.server.util.FileHelper;
+
 public abstract class AbstractPasswordFilePrincipalDatabase<U extends PasswordPrincipal> implements PrincipalDatabase
 {
     protected static final String DEFAULT_ENCODING = "utf-8";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
index 2acf8af987..0873cca31d 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabase.java
@@ -32,7 +32,8 @@ import javax.security.auth.login.AccountNotFoundException;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedInitialiser;
 import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5HashedSaslServer;
@@ -50,7 +51,7 @@ import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer;
  */
 public class Base64MD5PasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<HashedUser>
 {
-    private final Logger _logger = Logger.getLogger(Base64MD5PasswordFilePrincipalDatabase.class);
+    private final Logger _logger = LoggerFactory.getLogger(Base64MD5PasswordFilePrincipalDatabase.class);
     private List<String> _mechanisms = Collections.unmodifiableList(Arrays.asList(CRAMMD5HashedSaslServer.MECHANISM,
                                                                                   CRAMMD5HexSaslServer.MECHANISM,
                                                                                   PlainSaslServer.MECHANISM));
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
index 2b2ecd1d92..4a50d893d4 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/HashedUser.java
@@ -20,19 +20,17 @@
  */
 package org.apache.qpid.server.security.auth.database;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.util.ServerScopedRuntimeException;
-
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import org.apache.commons.codec.binary.Base64;
+
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
+
 
 public class HashedUser implements PasswordPrincipal
 {
-    private static final Logger _logger = Logger.getLogger(HashedUser.class);
-
     private String _name;
     private char[] _password;
     private byte[] _encodedPassword = null;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
index 0a55f5d510..8326dce4e4 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
@@ -33,7 +33,8 @@ import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.security.auth.sasl.crammd5.CRAMMD5Initialiser;
 import org.apache.qpid.server.security.auth.sasl.plain.PlainInitialiser;
@@ -49,7 +50,7 @@ import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer;
 public class PlainPasswordFilePrincipalDatabase extends AbstractPasswordFilePrincipalDatabase<PlainUser>
 {
 
-    private final Logger _logger = Logger.getLogger(PlainPasswordFilePrincipalDatabase.class);
+    private final Logger _logger = LoggerFactory.getLogger(PlainPasswordFilePrincipalDatabase.class);
     private final Map<String, CallbackHandler> _callbackHandlerMap = new HashMap<String, CallbackHandler>();
     private final List<String> _mechanisms = Collections.unmodifiableList(Arrays.asList(PlainSaslServer.MECHANISM,
                                                                                         CRAMMD5Initialiser.MECHANISM));
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
index 255457a846..8f53eec4f2 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
@@ -30,7 +30,8 @@ import java.util.Set;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
@@ -52,7 +53,7 @@ public abstract class AbstractAuthenticationManager<T extends AbstractAuthentica
     extends AbstractConfiguredObject<T>
     implements AuthenticationProvider<T>
 {
-    private static final Logger LOGGER = Logger.getLogger(AbstractAuthenticationManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAuthenticationManager.class);
 
     private final Broker<?> _broker;
     private PreferencesProvider<?> _preferencesProvider;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index 0fcab33f5d..19efee888f 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
@@ -43,7 +43,8 @@ import javax.security.sasl.SaslServer;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -69,7 +70,7 @@ public abstract class PrincipalDatabaseAuthenticationManager<T extends Principal
         implements ExternalFileBasedAuthenticationManager<T>, PreferencesSupportingAuthenticationProvider
 {
 
-    private static final Logger LOGGER = Logger.getLogger(PrincipalDatabaseAuthenticationManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PrincipalDatabaseAuthenticationManager.class);
 
 
     private final Map<Principal, PrincipalAdapter> _userMap = new ConcurrentHashMap<Principal, PrincipalAdapter>();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
index f51bcee521..e20349d4e3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManager.java
@@ -37,7 +37,8 @@ import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ManagedObject;
@@ -50,7 +51,7 @@ import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer;
 @ManagedObject( category = false, type = "Simple", register = false )
 public class SimpleAuthenticationManager extends AbstractAuthenticationManager<SimpleAuthenticationManager> implements PreferencesSupportingAuthenticationProvider
 {
-    private static final Logger _logger = Logger.getLogger(SimpleAuthenticationManager.class);
+    private static final Logger _logger = LoggerFactory.getLogger(SimpleAuthenticationManager.class);
 
     private static final String PLAIN_MECHANISM = "PLAIN";
     private static final String CRAM_MD5_MECHANISM = "CRAM-MD5";
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
index 2a6b5bda2c..1e9948eee5 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerImpl.java
@@ -20,8 +20,8 @@
 package org.apache.qpid.server.security.auth.manager;
 
 import static java.util.Collections.disjoint;
-import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.singletonList;
+import static java.util.Collections.unmodifiableList;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
@@ -49,15 +49,14 @@ import javax.security.sasl.AuthorizeCallback;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.ManagedAttributeField;
-import org.apache.qpid.server.model.ManagedObject;
 import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.PreferencesSupportingAuthenticationProvider;
 import org.apache.qpid.server.model.TrustStore;
 import org.apache.qpid.server.security.auth.AuthenticationResult;
 import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
@@ -72,7 +71,7 @@ import org.apache.qpid.ssl.SSLContextFactory;
 public class SimpleLDAPAuthenticationManagerImpl extends AbstractAuthenticationManager<SimpleLDAPAuthenticationManagerImpl>
         implements SimpleLDAPAuthenticationManager<SimpleLDAPAuthenticationManagerImpl>
 {
-    private static final Logger _logger = Logger.getLogger(SimpleLDAPAuthenticationManagerImpl.class);
+    private static final Logger _logger = LoggerFactory.getLogger(SimpleLDAPAuthenticationManagerImpl.class);
 
     private static final List<String> CONNECTIVITY_ATTRS = unmodifiableList(Arrays.asList(PROVIDER_URL,
                                                                              PROVIDER_AUTH_URL,
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
index f36ef1516c..1ac66e9197 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/UsernamePasswordInitialiser.java
@@ -20,10 +20,8 @@
  */
 package org.apache.qpid.server.security.auth.sasl;
 
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
+import java.io.IOException;
+import java.security.Principal;
 
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -32,12 +30,16 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.AccountNotFoundException;
 import javax.security.sasl.AuthorizeCallback;
-import java.io.IOException;
-import java.security.Principal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.security.auth.UsernamePrincipal;
+import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
 
 public abstract class UsernamePasswordInitialiser implements AuthenticationProviderInitialiser
 {
-    protected static final Logger _logger = Logger.getLogger(UsernamePasswordInitialiser.class);
+    protected static final Logger _logger = LoggerFactory.getLogger(UsernamePasswordInitialiser.class);
 
     private ServerCallbackHandler _callbackHandler;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
index 5f5ee08c21..c3a35ef228 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/auth/sasl/external/ExternalSaslServer.java
@@ -24,13 +24,15 @@ import javax.security.auth.x500.X500Principal;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.security.auth.UsernamePrincipal;
 import org.apache.qpid.transport.network.security.ssl.SSLUtil;
 
 public class ExternalSaslServer implements SaslServer
 {
-    private static final Logger LOGGER = Logger.getLogger(ExternalSaslServer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExternalSaslServer.class);
 
     public static final String MECHANISM = "EXTERNAL";
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
index 1e9e646e35..c7c3e5a0ab 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
@@ -33,7 +33,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.util.BaseAction;
 import org.apache.qpid.server.util.FileHelper;
 import org.apache.qpid.server.util.ServerScopedRuntimeException;
@@ -46,7 +48,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
  */
 public class FileGroupDatabase implements GroupDatabase
 {
-    private static final Logger LOGGER = Logger.getLogger(FileGroupDatabase.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileGroupDatabase.class);
 
     private Map<String, Set<String>> _groupToUserMap = new ConcurrentHashMap<String, Set<String>>();
     private Map<String, Set<String>> _userToGroupMap = new ConcurrentHashMap<String, Set<String>>();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
index 4fbfdfdd2d..64029497ee 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCConfigurationStore.java
@@ -39,7 +39,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonParseException;
@@ -51,6 +50,7 @@ import org.codehaus.jackson.map.Module;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializerProvider;
 import org.codehaus.jackson.map.module.SimpleModule;
+import org.slf4j.Logger;
 
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.UUIDGenerator;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
index 5868ae61c5..93a7b466a3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
@@ -37,7 +37,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
 
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.model.ConfiguredObject;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
index 196ea05a43..bb89d58dcb 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/EventManager.java
@@ -24,12 +24,13 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EventManager
 {
     private Map<Event, List<EventListener>> _listeners = new EnumMap<Event, List<EventListener>> (Event.class);
-    private static final Logger _LOGGER = Logger.getLogger(EventManager.class);
+    private static final Logger _LOGGER = LoggerFactory.getLogger(EventManager.class);
 
     public synchronized void addEventListener(EventListener listener, Event... events)
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java
index 9edc5fd30a..10e97d43c3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericRecoverer.java
@@ -30,7 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.updater.VoidTask;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -39,7 +40,7 @@ import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
 public class GenericRecoverer
 {
-    private static final Logger LOGGER = Logger.getLogger(GenericRecoverer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GenericRecoverer.class);
 
     private final ConfiguredObject<?> _root;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java
index 26b60f765f..850466bbae 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/GenericStoreUpgrader.java
@@ -26,14 +26,16 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.model.BrokerModel;
 import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
 
 public class GenericStoreUpgrader
 {
-    private static final Logger LOGGER = Logger.getLogger(GenericStoreUpgrader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GenericStoreUpgrader.class);
 
     private final Map<UUID, ConfiguredObjectRecord> _records = new HashMap<UUID, ConfiguredObjectRecord>();
     private final Map<String, StoreUpgraderPhase> _upgraders;
@@ -167,4 +169,4 @@ public class GenericStoreUpgrader
         }
         return BrokerModel.MODEL_VERSION;
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
index a26e478a50..62675867f0 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JdbcUtils.java
@@ -25,8 +25,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
 
 public class JdbcUtils
 {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
index ad671d7e99..23e1456aea 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
@@ -41,10 +41,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.util.BaseAction;
-import org.apache.qpid.server.util.FileHelper;
 import org.codehaus.jackson.JsonGenerator;
 import org.codehaus.jackson.JsonProcessingException;
 import org.codehaus.jackson.Version;
@@ -54,15 +50,20 @@ import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.SerializationConfig;
 import org.codehaus.jackson.map.SerializerProvider;
 import org.codehaus.jackson.map.module.SimpleModule;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.model.Model;
 import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
+import org.apache.qpid.server.util.BaseAction;
+import org.apache.qpid.server.util.FileHelper;
 import org.apache.qpid.util.FileUtils;
 
 public class JsonFileConfigStore implements DurableConfigurationStore
 {
-    private static final Logger _logger = Logger.getLogger(JsonFileConfigStore.class);
+    private static final Logger _logger = LoggerFactory.getLogger(JsonFileConfigStore.class);
 
     private static final Comparator<Class<? extends ConfiguredObject>> CATEGORY_CLASS_COMPARATOR =
             new Comparator<Class<? extends ConfiguredObject>>()
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
index 809c234cc6..97e544d566 100755
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java
@@ -23,7 +23,8 @@ package org.apache.qpid.server.txn;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.MessageInstance;
@@ -45,7 +46,7 @@ public class AsyncAutoCommitTransaction implements ServerTransaction
 {
     static final String QPID_STRICT_ORDER_WITH_MIXED_DELIVERY_MODE = "qpid.strict_order_with_mixed_delivery_mode";
 
-    protected static final Logger _logger = Logger.getLogger(AsyncAutoCommitTransaction.class);
+    protected static final Logger _logger = LoggerFactory.getLogger(AsyncAutoCommitTransaction.class);
 
     private final MessageStore _messageStore;
     private final FutureRecorder _futureRecorder;
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
index 2ecd847719..81db5b0358 100755
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/AutoCommitTransaction.java
@@ -23,7 +23,8 @@ package org.apache.qpid.server.txn;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.message.MessageInstance;
@@ -42,7 +43,7 @@ import org.apache.qpid.server.store.TransactionLogResource;
  */
 public class AutoCommitTransaction implements ServerTransaction
 {
-    protected static final Logger _logger = Logger.getLogger(AutoCommitTransaction.class);
+    protected static final Logger _logger = LoggerFactory.getLogger(AutoCommitTransaction.class);
 
     private final MessageStore _messageStore;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
index 4195c72a28..15b66a90a5 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
@@ -27,11 +27,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ScheduledFuture;
 
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.store.StoreException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.store.Transaction;
 import org.apache.qpid.server.store.TransactionLogResource;
 import org.apache.qpid.server.virtualhost.VirtualHostImpl;
@@ -39,7 +41,7 @@ import org.apache.qpid.transport.Xid;
 
 public class DtxBranch
 {
-    private static final Logger _logger = Logger.getLogger(DtxBranch.class);
+    private static final Logger _logger = LoggerFactory.getLogger(DtxBranch.class);
 
     private final Xid _xid;
     private final List<ServerTransaction.Action> _postTransactionActions = new ArrayList<ServerTransaction.Action>();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java
index a7b527f169..4e074b2722 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java
@@ -20,11 +20,13 @@
  */
 package org.apache.qpid.server.util;
 
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ConnectionScopedRuntimeException extends RuntimeException
 {
-    private static final Logger LOGGER = Logger.getLogger(ConnectionScopedRuntimeException.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionScopedRuntimeException.class);
 
 
     public ConnectionScopedRuntimeException(final String message)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java
index 93ba639af0..5b6d99e285 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/util/ServerScopedRuntimeException.java
@@ -20,11 +20,12 @@
  */
 package org.apache.qpid.server.util;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ServerScopedRuntimeException extends RuntimeException
 {
-    private static final Logger LOGGER = Logger.getLogger(ServerScopedRuntimeException.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ServerScopedRuntimeException.class);
 
     public ServerScopedRuntimeException(final String message)
     {
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
index 220beb20f8..76fbb4f48e 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
@@ -46,7 +46,8 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.pool.SuppressingInheritedAccessControlContextThreadFactory;
@@ -110,7 +111,7 @@ public abstract class AbstractVirtualHost<X extends AbstractVirtualHost<X>> exte
     public static final String CREATE_DLQ_ON_CREATION = "x-qpid-dlq-enabled"; // TODO - this value should change
     private static final int MAX_LENGTH = 255;
 
-    private static final Logger _logger = Logger.getLogger(AbstractVirtualHost.class);
+    private static final Logger _logger = LoggerFactory.getLogger(AbstractVirtualHost.class);
 
     private static final int HOUSEKEEPING_SHUTDOWN_TIMEOUT = 5;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
index 628b0ea08c..a24ddec7df 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
@@ -32,7 +32,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.TransactionLogMessages;
@@ -58,7 +59,7 @@ import org.apache.qpid.transport.util.Functions;
 
 public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
 {
-    private static final Logger _logger = Logger.getLogger(AsynchronousMessageStoreRecoverer.class);
+    private static final Logger _logger = LoggerFactory.getLogger(AsynchronousMessageStoreRecoverer.class);
     private AsynchronousRecoverer _asynchronousRecoverer;
 
     @Override
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
index 22e33848bf..99896b87b6 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java
@@ -20,17 +20,19 @@
  */
 package org.apache.qpid.server.virtualhost;
 
-import org.apache.log4j.Logger;
+import java.security.PrivilegedAction;
+
+import javax.security.auth.Subject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.security.SecurityManager;
 
-import javax.security.auth.Subject;
-import java.security.PrivilegedAction;
-
 public abstract class HouseKeepingTask implements Runnable
 {
-    private Logger _logger = Logger.getLogger(this.getClass());
+    private Logger _logger = LoggerFactory.getLogger(this.getClass());
 
     private String _name;
 
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
index 1cdafde945..8bdffeb3c6 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
@@ -26,7 +26,8 @@ import java.util.Map;
 import java.util.TreeMap;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.MessageStoreMessages;
@@ -56,7 +57,7 @@ import org.apache.qpid.transport.util.Functions;
 
 public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
 {
-    private static final Logger _logger = Logger.getLogger(SynchronousMessageStoreRecoverer.class);
+    private static final Logger _logger = LoggerFactory.getLogger(SynchronousMessageStoreRecoverer.class);
 
     @Override
     public void recover(VirtualHostImpl virtualHost)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
index e9390703c7..0a1c2abd75 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
@@ -35,7 +35,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.HostNameAlias;
@@ -49,7 +50,7 @@ public class HostNameAliasImpl
         implements HostNameAlias<HostNameAliasImpl>
 {
 
-    private static final Logger LOG = Logger.getLogger(HostNameAliasImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HostNameAliasImpl.class);
 
     private final Set<InetAddress> _localAddresses = new CopyOnWriteArraySet<>();
     private final Set<String> _localAddressNames = new CopyOnWriteArraySet<>();
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
index fd73963b68..7bd1b14e42 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java
@@ -31,7 +31,8 @@ import javax.security.auth.Subject;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.logging.messages.ConfigStoreMessages;
@@ -49,7 +50,7 @@ import org.apache.qpid.server.store.VirtualHostStoreUpgraderAndRecoverer;
 public abstract class AbstractStandardVirtualHostNode<X extends AbstractStandardVirtualHostNode<X>> extends AbstractVirtualHostNode<X>
                 implements VirtualHostNode<X>
 {
-    private static final Logger LOGGER = Logger.getLogger(AbstractStandardVirtualHostNode.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractStandardVirtualHostNode.class);
 
     public AbstractStandardVirtualHostNode(Map<String, Object> attributes,
                                            Broker<?> parent)
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
index 8e08554358..ebf09b46c3 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
@@ -41,7 +41,8 @@ import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
@@ -75,7 +76,7 @@ import org.apache.qpid.server.virtualhost.ProvidedStoreVirtualHostImpl;
 public abstract class AbstractVirtualHostNode<X extends AbstractVirtualHostNode<X>> extends AbstractConfiguredObject<X> implements VirtualHostNode<X>
 {
 
-    private static final Logger LOGGER = Logger.getLogger(AbstractVirtualHostNode.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractVirtualHostNode.class);
 
 
     static
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
index 7667267df3..749b58323b 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
@@ -38,10 +38,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
 import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.server.binding.BindingImpl;
@@ -66,7 +67,7 @@ import org.apache.qpid.test.utils.QpidTestCase;
 
 abstract class AbstractQueueTestBase extends QpidTestCase
 {
-    private static final Logger _logger = Logger.getLogger(AbstractQueueTestBase.class);
+    private static final Logger _logger = LoggerFactory.getLogger(AbstractQueueTestBase.class);
 
 
     private AMQQueue<?> _queue;
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
index be4505bc80..f4b25665ba 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
@@ -26,7 +26,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.message.EnqueueableMessage;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -36,7 +37,7 @@ import org.apache.qpid.util.FileUtils;
 
 public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase implements EventListener, TransactionLogResource
 {
-    private static final Logger _logger = Logger.getLogger(MessageStoreQuotaEventsTestBase.class);
+    private static final Logger _logger = LoggerFactory.getLogger(MessageStoreQuotaEventsTestBase.class);
 
     protected static final byte[] MESSAGE_DATA = new byte[32 * 1024];
 
diff --git a/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm b/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
index 6a97f7facd..64cf002750 100644
--- a/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
+++ b/qpid/java/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
@@ -22,7 +22,8 @@ package ${package};
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
 
@@ -50,9 +51,9 @@ public class ${type.name}Messages
 
     static
     {
-        Logger.getLogger(${type.name.toUpperCase()}_LOG_HIERARCHY);
+        LoggerFactory.getLogger(${type.name.toUpperCase()}_LOG_HIERARCHY);
 #foreach( $message in ${type.list} )
-        Logger.getLogger(${message.methodName.toUpperCase()}_LOG_HIERARCHY);
+        LoggerFactory.getLogger(${message.methodName.toUpperCase()}_LOG_HIERARCHY);
 #end
 
         _messages = ResourceBundle.getBundle("${resource}", _currentLocale);