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

23 files changed, 229 insertions, 116 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index be9248c0d2..c668cc8595 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -41,7 +41,7 @@ import com.sleepycat.je.OperationStatus;
 import com.sleepycat.je.Sequence;
 import com.sleepycat.je.SequenceConfig;
 import com.sleepycat.je.Transaction;
-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/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
index 4717aab472..045a4a05e6 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
@@ -20,16 +20,6 @@
  */
 package org.apache.qpid.server.store.berkeleydb;
 
-import com.sleepycat.je.DatabaseException;
-import com.sleepycat.je.Environment;
-import com.sleepycat.je.EnvironmentConfig;
-import com.sleepycat.je.util.DbBackup;
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.util.CommandLineParser;
-import org.apache.qpid.util.FileUtils;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -39,6 +29,17 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
+import com.sleepycat.je.DatabaseException;
+import com.sleepycat.je.Environment;
+import com.sleepycat.je.EnvironmentConfig;
+import com.sleepycat.je.util.DbBackup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.store.StoreException;
+import org.apache.qpid.util.CommandLineParser;
+import org.apache.qpid.util.FileUtils;
+
 /**
  * BDBBackup is a utility for taking hot backups of the current state of a BDB transaction log database.
  * <p>
@@ -77,10 +78,10 @@ import java.util.Properties;
 public class BDBBackup
 {
     /** Used for debugging. */
-    private static final Logger log = Logger.getLogger(BDBBackup.class);
+    private static final Logger log = LoggerFactory.getLogger(BDBBackup.class);
 
     /** Used for communicating with the user. */
-    private static final Logger console = Logger.getLogger("Console");
+    private static final Logger console = LoggerFactory.getLogger("Console");
 
     /** Defines the suffix used to identify BDB log files. */
     private static final String LOG_FILE_SUFFIX = ".jdb";
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
index f082c23c8a..87bd606f83 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfigurationStore.java
@@ -38,7 +38,8 @@ import com.sleepycat.je.DatabaseEntry;
 import com.sleepycat.je.LockMode;
 import com.sleepycat.je.OperationStatus;
 import com.sleepycat.je.Transaction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.store.ConfiguredObjectRecord;
@@ -62,7 +63,7 @@ import org.apache.qpid.util.FileUtils;
  */
 public class BDBConfigurationStore implements MessageStoreProvider, DurableConfigurationStore
 {
-    private static final Logger LOGGER = Logger.getLogger(BDBConfigurationStore.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BDBConfigurationStore.class);
 
     public static final int VERSION = 8;
     private static final String CONFIGURED_OBJECTS_DB_NAME = "CONFIGURED_OBJECTS";
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
index 2f00d9852c..36c235d5a8 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
@@ -24,7 +24,8 @@ import java.io.File;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.sleepycat.je.DatabaseException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.model.ConfiguredObject;
 import org.apache.qpid.server.store.FileBasedSettings;
@@ -37,7 +38,7 @@ import org.apache.qpid.util.FileUtils;
  */
 public class BDBMessageStore extends AbstractBDBMessageStore
 {
-    private static final Logger LOGGER = Logger.getLogger(BDBMessageStore.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BDBMessageStore.class);
 
     private final EnvironmentFacadeFactory _environmentFacadeFactory;
 
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java
index 23aefb8118..1f730e6d03 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBUtils.java
@@ -25,13 +25,14 @@ import com.sleepycat.je.DatabaseConfig;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.EnvironmentConfig;
 import com.sleepycat.je.Transaction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.store.StoreException;
 
 public class BDBUtils
 {
-    private static final Logger LOGGER = Logger.getLogger(BDBUtils.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BDBUtils.class);
 
     public static final DatabaseConfig DEFAULT_DATABASE_CONFIG = new DatabaseConfig().setTransactional(true).setAllowCreate(true);
 
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
index 2a8cf92b3d..6699de5dec 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
@@ -28,7 +28,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import com.sleepycat.je.DatabaseException;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.Transaction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.util.FutureResult;
 
@@ -75,7 +76,7 @@ public class CoalescingCommiter implements Committer
 
     private static final class BDBCommitFutureResult implements FutureResult
     {
-        private static final Logger LOGGER = Logger.getLogger(BDBCommitFutureResult.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(BDBCommitFutureResult.class);
 
         private final CommitThread _commitThread;
         private final Transaction _tx;
@@ -209,7 +210,7 @@ public class CoalescingCommiter implements Committer
      */
     private static class CommitThread extends Thread
     {
-        private static final Logger LOGGER = Logger.getLogger(CommitThread.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(CommitThread.class);
 
         private final AtomicBoolean _stopped = new AtomicBoolean(false);
         private final Queue<BDBCommitFutureResult> _jobQueue = new ConcurrentLinkedQueue<BDBCommitFutureResult>();
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
index 133a0ee7d9..cbfeb2d9ff 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CommitThreadWrapper.java
@@ -29,7 +29,8 @@ import com.sleepycat.je.CheckpointConfig;
 import com.sleepycat.je.DatabaseException;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.Transaction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.util.FutureResult;
@@ -63,7 +64,7 @@ public class CommitThreadWrapper
 
     private static final class BDBCommitFutureResult implements FutureResult
     {
-        private static final Logger LOGGER = Logger.getLogger(BDBCommitFutureResult.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(BDBCommitFutureResult.class);
 
         private final CommitThread _commitThread;
         private final Transaction _tx;
@@ -198,7 +199,7 @@ public class CommitThreadWrapper
      */
     private static class CommitThread extends Thread
     {
-        private static final Logger LOGGER = Logger.getLogger(CommitThread.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(CommitThread.class);
 
         private final AtomicBoolean _stopped = new AtomicBoolean(false);
         private final Queue<BDBCommitFutureResult> _jobQueue = new ConcurrentLinkedQueue<BDBCommitFutureResult>();
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java
index b13766a136..a499f10ce1 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/LoggingAsyncExceptionListener.java
@@ -20,18 +20,19 @@
  */
 package org.apache.qpid.server.store.berkeleydb;
 
-import org.apache.log4j.Logger;
 
 import com.sleepycat.je.ExceptionEvent;
 import com.sleepycat.je.ExceptionListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class LoggingAsyncExceptionListener implements ExceptionListener
 {
-    private static final Logger LOGGER  = Logger.getLogger(LoggingAsyncExceptionListener.class);
+    private static final Logger LOGGER  = LoggerFactory.getLogger(LoggingAsyncExceptionListener.class);
 
     @Override
     public void exceptionThrown(ExceptionEvent event)
     {
         LOGGER.error("Asynchronous exception thrown by BDB thread '" + event.getThreadName() + "'", event.getException());
     }
-}
\ No newline at end of file
+}
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
index eff652ce05..3c65da63d5 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacade.java
@@ -35,7 +35,8 @@ import com.sleepycat.je.EnvironmentConfig;
 import com.sleepycat.je.Sequence;
 import com.sleepycat.je.SequenceConfig;
 import com.sleepycat.je.Transaction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.server.util.FutureResult;
@@ -43,7 +44,7 @@ import org.apache.qpid.server.store.berkeleydb.logging.Log4jLoggingHandler;
 
 public class StandardEnvironmentFacade implements EnvironmentFacade
 {
-    private static final Logger LOGGER = Logger.getLogger(StandardEnvironmentFacade.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(StandardEnvironmentFacade.class);
 
     private final String _storePath;
     private final ConcurrentMap<String, Database> _cachedDatabases = new ConcurrentHashMap<>();
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java
index 0aec43e4ad..6b952d53dd 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/logging/Log4jLoggingHandler.java
@@ -29,6 +29,9 @@ import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 
 public class Log4jLoggingHandler extends Handler
 {
@@ -44,31 +47,118 @@ public class Log4jLoggingHandler extends Handler
         });
     }
 
-    private static final Map<Level, org.apache.log4j.Level> LEVEL_MAP;
+    private static interface MappedLevel
+    {
+        public boolean isEnabled(final Logger logger);
+
+        void log(Logger logger, String message);
+    }
+
+    private static final MappedLevel ERROR = new MappedLevel()
+    {
+        @Override
+        public boolean isEnabled(final Logger logger)
+        {
+            return logger.isErrorEnabled();
+        }
+
+        @Override
+        public void log(final Logger logger, final String message)
+        {
+            logger.error(message);
+        }
+    };
+
+    private static final MappedLevel WARN = new MappedLevel()
+    {
+        @Override
+        public boolean isEnabled(final Logger logger)
+        {
+            return logger.isWarnEnabled();
+        }
+
+        @Override
+        public void log(final Logger logger, final String message)
+        {
+            logger.warn(message);
+        }
+    };
+
+    private static final MappedLevel INFO = new MappedLevel()
+    {
+        @Override
+        public boolean isEnabled(final Logger logger)
+        {
+            return logger.isInfoEnabled();
+        }
+
+        @Override
+        public void log(final Logger logger, final String message)
+        {
+            logger.info(message);
+        }
+    };
+
+    private static final MappedLevel DEBUG = new MappedLevel()
+    {
+        @Override
+        public boolean isEnabled(final Logger logger)
+        {
+            return logger.isDebugEnabled();
+        }
+
+        @Override
+        public void log(final Logger logger, final String message)
+        {
+            logger.debug(message);
+        }
+    };
+
+    private static final MappedLevel TRACE = new MappedLevel()
+    {
+        @Override
+        public boolean isEnabled(final Logger logger)
+        {
+            return logger.isTraceEnabled();
+        }
+
+        @Override
+        public void log(final Logger logger, final String message)
+        {
+            logger.trace(message);
+        }
+    };
+
+    private static final Map<Level, MappedLevel> LEVEL_MAP;
     static
     {
-        Map<Level, org.apache.log4j.Level> map = new HashMap<>();
-        map.put(Level.SEVERE, org.apache.log4j.Level.ERROR);
-        map.put(Level.WARNING, org.apache.log4j.Level.WARN);
+        Map<Level, MappedLevel> map = new HashMap<>();
+        map.put(Level.SEVERE, ERROR);
+        map.put(Level.WARNING, WARN);
         //Note that INFO comes out at DEBUG level as the BDB logging at INFO seems to be more of a DEBUG nature
-        map.put(Level.INFO, org.apache.log4j.Level.DEBUG);
-        map.put(Level.CONFIG, org.apache.log4j.Level.DEBUG);
-        map.put(Level.FINE, org.apache.log4j.Level.TRACE);
-        map.put(Level.FINER, org.apache.log4j.Level.TRACE);
-        map.put(Level.FINEST, org.apache.log4j.Level.TRACE);
-        map.put(Level.ALL, org.apache.log4j.Level.TRACE);
+        map.put(Level.INFO, DEBUG);
+        map.put(Level.CONFIG, DEBUG);
+        map.put(Level.FINE, TRACE);
+        map.put(Level.FINER, TRACE);
+        map.put(Level.FINEST, TRACE);
+        map.put(Level.ALL, TRACE);
 
         LEVEL_MAP = Collections.unmodifiableMap(map);
     }
 
-    private static final org.apache.log4j.Logger BDB_LOGGER = org.apache.log4j.Logger.getLogger("BDB");
+    private static final Logger BDB_LOGGER = LoggerFactory.getLogger("BDB");
 
+    private boolean isEnabledFor(Level level)
+    {
+        final MappedLevel mappedLevel = LEVEL_MAP.get(level);
+        return mappedLevel == null ? false : mappedLevel.isEnabled(BDB_LOGGER);
+    }
 
     @Override
     public void publish(final LogRecord record)
     {
-        org.apache.log4j.Level level = convertLevel(record.getLevel());
-        if (BDB_LOGGER.isEnabledFor(level))
+        MappedLevel level = convertLevel(record.getLevel());
+        if (level.isEnabled(BDB_LOGGER))
         {
 
             Formatter formatter = getFormatter();
@@ -78,7 +168,7 @@ public class Log4jLoggingHandler extends Handler
                 String message = formatter.format(record);
                 try
                 {
-                    BDB_LOGGER.log(level, message);
+                    level.log(BDB_LOGGER, message);
                 }
                 catch (RuntimeException e)
                 {
@@ -95,30 +185,32 @@ public class Log4jLoggingHandler extends Handler
     @Override
     public boolean isLoggable(final LogRecord record)
     {
-        return BDB_LOGGER.isEnabledFor(convertLevel(record.getLevel()));
+        MappedLevel mappedLevel = convertLevel(record.getLevel());
+
+        return mappedLevel.isEnabled(BDB_LOGGER);
     }
 
-    private org.apache.log4j.Level convertLevel(final Level level)
+    private MappedLevel convertLevel(final Level level)
     {
         //Note that INFO comes out at DEBUG level as the BDB logging at INFO seems to be more of a DEBUG nature
-        org.apache.log4j.Level result = LEVEL_MAP.get(level);
+        MappedLevel result = LEVEL_MAP.get(level);
         if(result == null)
         {
             if (level.intValue() >= Level.SEVERE.intValue())
             {
-                result = org.apache.log4j.Level.ERROR;
+                result = ERROR;
             }
             else if (level.intValue() >= Level.WARNING.intValue())
             {
-                result = org.apache.log4j.Level.WARN;
+                result = WARN;
             }
             else if (level.intValue() >= Level.CONFIG.intValue())
             {
-                result = org.apache.log4j.Level.DEBUG;
+                result = DEBUG;
             }
             else
             {
-                result = org.apache.log4j.Level.TRACE;
+                result = TRACE;
             }
         }
 
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java
index 09e17cfc98..ef522a4594 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/DatabasePinger.java
@@ -20,8 +20,6 @@
  */
 package org.apache.qpid.server.store.berkeleydb.replication;
 
-import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade;
-
 import com.sleepycat.bind.tuple.IntegerBinding;
 import com.sleepycat.bind.tuple.LongBinding;
 import com.sleepycat.je.Database;
@@ -30,11 +28,14 @@ import com.sleepycat.je.DatabaseEntry;
 import com.sleepycat.je.Durability;
 import com.sleepycat.je.Transaction;
 import com.sleepycat.je.TransactionConfig;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade;
 
 public class DatabasePinger
 {
-    private static final Logger LOGGER = Logger.getLogger(DatabasePinger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DatabasePinger.class);
 
     public static final String PING_DATABASE_NAME = "PINGDB";
     private static final DatabaseConfig DATABASE_CONFIG =
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
index 4c0bf41cbf..b88e99c805 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacade.java
@@ -68,8 +68,9 @@ import com.sleepycat.je.rep.utilint.ServiceDispatcher.ServiceConnectFailedExcept
 import com.sleepycat.je.rep.vlsn.VLSNRange;
 import com.sleepycat.je.utilint.PropUtil;
 import com.sleepycat.je.utilint.VLSN;
-import org.apache.log4j.Logger;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.store.StoreException;
@@ -91,7 +92,7 @@ public class ReplicatedEnvironmentFacade implements EnvironmentFacade, StateChan
     public static final String ENVIRONMENT_RESTART_RETRY_LIMIT_PROPERTY_NAME = "qpid.bdb.ha.environment_restart_retry_limit";
     public static final String EXECUTOR_SHUTDOWN_TIMEOUT_PROPERTY_NAME = "qpid.bdb.ha.executor_shutdown_timeout";
 
-    private static final Logger LOGGER = Logger.getLogger(ReplicatedEnvironmentFacade.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReplicatedEnvironmentFacade.class);
 
     private static final int DEFAULT_MASTER_TRANSFER_TIMEOUT = 1000 * 60;
     private static final int DEFAULT_DB_PING_SOCKET_TIMEOUT = 1000;
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
index 43aa5aa2b4..4a53a00363 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractStoreUpgrade.java
@@ -22,15 +22,15 @@ package org.apache.qpid.server.store.berkeleydb.upgrade;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import com.sleepycat.je.Database;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractStoreUpgrade implements StoreUpgrade
 {
-    private static final Logger _logger = Logger.getLogger(AbstractStoreUpgrade.class);
+    private static final Logger _logger = LoggerFactory.getLogger(AbstractStoreUpgrade.class);
 
     protected void reportFinished(Environment environment, int version)
     {
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
index 925e40ea93..59573ee680 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/CursorOperation.java
@@ -20,15 +20,16 @@
  */
 package org.apache.qpid.server.store.berkeleydb.upgrade;
 
-import org.apache.log4j.Logger;
 
 import com.sleepycat.je.Database;
 import com.sleepycat.je.DatabaseEntry;
 import com.sleepycat.je.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class CursorOperation implements DatabaseRunnable
 {
-    private static final Logger _logger = Logger.getLogger(CursorOperation.class);
+    private static final Logger _logger = LoggerFactory.getLogger(CursorOperation.class);
 
     private CursorTemplate _template;
     private long _rowCount;
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
index 135158afa4..464f4b4101 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/DatabaseTemplate.java
@@ -20,16 +20,16 @@
  */
 package org.apache.qpid.server.store.berkeleydb.upgrade;
 
-import org.apache.log4j.Logger;
-
 import com.sleepycat.je.Database;
 import com.sleepycat.je.DatabaseConfig;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DatabaseTemplate
 {
-    private static final Logger _logger = Logger.getLogger(DatabaseTemplate.class);
+    private static final Logger _logger = LoggerFactory.getLogger(DatabaseTemplate.class);
 
     private Environment _environment;
     private String _sourceDatabaseName;
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
index 1d689090ae..05f0039b24 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
@@ -40,7 +40,8 @@ import com.sleepycat.je.Database;
 import com.sleepycat.je.DatabaseEntry;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.Transaction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.exchange.ExchangeDefaults;
@@ -73,7 +74,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
 
     private static final byte COLON = (byte) ':';
 
-    private static final Logger _logger = Logger.getLogger(UpgradeFrom4To5.class);
+    private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom4To5.class);
 
     public void performUpgrade(final Environment environment, final UpgradeInteractionHandler handler, ConfiguredObject<?> parent)
     {
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
index 1e4bfec09c..40b0afb9a1 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
@@ -35,7 +35,21 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import com.sleepycat.bind.tuple.LongBinding;
+import com.sleepycat.bind.tuple.TupleBinding;
+import com.sleepycat.bind.tuple.TupleInput;
+import com.sleepycat.bind.tuple.TupleOutput;
+import com.sleepycat.je.Cursor;
+import com.sleepycat.je.CursorConfig;
+import com.sleepycat.je.Database;
+import com.sleepycat.je.DatabaseEntry;
+import com.sleepycat.je.Environment;
+import com.sleepycat.je.LockMode;
+import com.sleepycat.je.OperationStatus;
+import com.sleepycat.je.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
@@ -51,23 +65,10 @@ import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding;
 import org.apache.qpid.server.store.berkeleydb.FieldTableEncoding;
 import org.apache.qpid.server.util.MapJsonSerializer;
 
-import com.sleepycat.bind.tuple.LongBinding;
-import com.sleepycat.bind.tuple.TupleBinding;
-import com.sleepycat.bind.tuple.TupleInput;
-import com.sleepycat.bind.tuple.TupleOutput;
-import com.sleepycat.je.Cursor;
-import com.sleepycat.je.CursorConfig;
-import com.sleepycat.je.Database;
-import com.sleepycat.je.DatabaseEntry;
-import com.sleepycat.je.Environment;
-import com.sleepycat.je.LockMode;
-import com.sleepycat.je.OperationStatus;
-import com.sleepycat.je.Transaction;
-
 public class UpgradeFrom5To6 extends AbstractStoreUpgrade
 {
 
-    private static final Logger _logger = Logger.getLogger(UpgradeFrom5To6.class);
+    private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom5To6.class);
 
     static final String OLD_CONTENT_DB_NAME = "messageContentDb_v5";
     static final String NEW_CONTENT_DB_NAME = "MESSAGE_CONTENT";
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
index 1be7e97a47..ec22ad0fc8 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/Upgrader.java
@@ -20,28 +20,28 @@
  */
 package org.apache.qpid.server.store.berkeleydb.upgrade;
 
-import com.sleepycat.je.Cursor;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.store.StoreException;
-import org.apache.qpid.server.store.berkeleydb.BDBConfigurationStore;
-
 import com.sleepycat.bind.tuple.IntegerBinding;
 import com.sleepycat.bind.tuple.LongBinding;
+import com.sleepycat.je.Cursor;
 import com.sleepycat.je.Database;
 import com.sleepycat.je.DatabaseConfig;
 import com.sleepycat.je.DatabaseEntry;
 import com.sleepycat.je.DatabaseException;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.OperationStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.store.StoreException;
+import org.apache.qpid.server.store.berkeleydb.BDBConfigurationStore;
 
 public class Upgrader
 {
-    private static final Logger LOGGER = Logger.getLogger(Upgrader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Upgrader.class);
 
     static final String VERSION_DB_NAME = "DB_VERSION";
 
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
index 002e012cac..0a9f076021 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeImpl.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.sleepycat.je.rep.MasterStateException;
-import org.apache.log4j.Logger;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.logging.EventLogger;
@@ -47,7 +46,6 @@ import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironment
 
 public class BDBHARemoteReplicationNodeImpl extends AbstractConfiguredObject<BDBHARemoteReplicationNodeImpl> implements BDBHARemoteReplicationNode<BDBHARemoteReplicationNodeImpl>
 {
-    private static final Logger LOGGER = Logger.getLogger(BDBHARemoteReplicationNodeImpl.class);
 
     private final ReplicatedEnvironmentFacade _replicatedEnvironmentFacade;
     private final String _address;
diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
index 9f4402881b..20c59ddf6a 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
@@ -56,7 +56,8 @@ import com.sleepycat.je.rep.StateChangeEvent;
 import com.sleepycat.je.rep.StateChangeListener;
 import com.sleepycat.je.rep.util.ReplicationGroupAdmin;
 import com.sleepycat.je.rep.utilint.HostPortPair;
-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.configuration.updater.Task;
@@ -104,7 +105,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
      */
     private static final int MUTATE_JE_TIMEOUT_MS = 100;
 
-    private static final Logger LOGGER = Logger.getLogger(BDBHAVirtualHostNodeImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(BDBHAVirtualHostNodeImpl.class);
 
     private final AtomicReference<ReplicatedEnvironmentFacade> _environmentFacade = new AtomicReference<>();
 
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
index ae8ba468f0..4b5069fec8 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
@@ -44,7 +44,9 @@ import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.client.AMQConnectionFactory;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
@@ -65,7 +67,7 @@ import org.apache.qpid.url.URLSyntaxException;
  */
 public class BDBStoreUpgradeTestPreparer
 {
-    private static final Logger _logger = Logger.getLogger(BDBStoreUpgradeTestPreparer.class);
+    private static final Logger _logger = LoggerFactory.getLogger(BDBStoreUpgradeTestPreparer.class);
 
     public static final String TOPIC_NAME="myUpgradeTopic";
     public static final String SUB_NAME="myDurSubName";
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
index f2ed48d2d9..c47307bdc0 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/ReplicatedEnvironmentFacadeTest.java
@@ -26,7 +26,12 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.File;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -35,17 +40,9 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import com.sleepycat.bind.tuple.IntegerBinding;
 import com.sleepycat.bind.tuple.StringBinding;
-import com.sleepycat.je.DatabaseEntry;
-import org.apache.log4j.Logger;
-import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade;
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
-import org.apache.qpid.test.utils.PortHelper;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.TestFileUtils;
-import org.apache.qpid.util.FileUtils;
-
 import com.sleepycat.je.Database;
 import com.sleepycat.je.DatabaseConfig;
+import com.sleepycat.je.DatabaseEntry;
 import com.sleepycat.je.Durability;
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.EnvironmentConfig;
@@ -58,10 +55,19 @@ import com.sleepycat.je.rep.ReplicationNode;
 import com.sleepycat.je.rep.StateChangeEvent;
 import com.sleepycat.je.rep.StateChangeListener;
 import org.codehaus.jackson.map.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.store.berkeleydb.EnvironmentFacade;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
+import org.apache.qpid.test.utils.PortHelper;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.util.FileUtils;
 
 public class ReplicatedEnvironmentFacadeTest extends QpidTestCase
 {
-    private static final Logger LOGGER = Logger.getLogger(ReplicatedEnvironmentFacadeTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ReplicatedEnvironmentFacadeTest.class);
     private static final int LISTENER_TIMEOUT = 5;
     private static final int WAIT_STATE_CHANGE_TIMEOUT = 30;
 
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
index 717534a6b8..6351ee5205 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
@@ -41,7 +41,15 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import com.sleepycat.bind.tuple.LongBinding;
+import com.sleepycat.je.Database;
+import com.sleepycat.je.DatabaseEntry;
+import com.sleepycat.je.Environment;
+import com.sleepycat.je.LockMode;
+import com.sleepycat.je.Transaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.model.Binding;
 import org.apache.qpid.server.model.Exchange;
 import org.apache.qpid.server.model.LifetimePolicy;
@@ -66,16 +74,9 @@ import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.UpgradeCo
 import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.UpgradeUUIDBinding;
 import org.apache.qpid.server.util.MapJsonSerializer;
 
-import com.sleepycat.bind.tuple.LongBinding;
-import com.sleepycat.je.Database;
-import com.sleepycat.je.DatabaseEntry;
-import com.sleepycat.je.Environment;
-import com.sleepycat.je.LockMode;
-import com.sleepycat.je.Transaction;
-
 public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase
 {
-    private static final Logger _logger = Logger.getLogger(UpgradeFrom5To6Test.class);
+    private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom5To6Test.class);
     private static final String ARGUMENTS = "arguments";
 
     @Override