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

3 files changed, 22 insertions, 13 deletions

diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
index 82802ec7ae..d96dc8d224 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyConfigurationStore.java
@@ -28,10 +28,17 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-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.*;
+import org.apache.qpid.server.store.AbstractJDBCConfigurationStore;
+import org.apache.qpid.server.store.ConfiguredObjectRecord;
+import org.apache.qpid.server.store.DurableConfigurationStore;
+import org.apache.qpid.server.store.FileBasedSettings;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.MessageStoreProvider;
+import org.apache.qpid.server.store.StoreException;
 import org.apache.qpid.util.FileUtils;
 
 /**
@@ -41,7 +48,7 @@ import org.apache.qpid.util.FileUtils;
 public class DerbyConfigurationStore extends AbstractJDBCConfigurationStore
         implements MessageStoreProvider, DurableConfigurationStore
 {
-    private static final Logger LOGGER = Logger.getLogger(DerbyConfigurationStore.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DerbyConfigurationStore.class);
 
     private final AtomicBoolean _configurationStoreOpen = new AtomicBoolean();
     private final ProvidedMessageStore _providedMessageStore = new ProvidedMessageStore();
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
index 7d1191da2c..10fed76b60 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
@@ -26,7 +26,8 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
-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;
@@ -38,7 +39,7 @@ import org.apache.qpid.util.FileUtils;
  */
 public class DerbyMessageStore extends AbstractDerbyMessageStore
 {
-    private static final Logger LOGGER = Logger.getLogger(DerbyMessageStore.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DerbyMessageStore.class);
 
     private String _connectionURL;
     private ConfiguredObject<?> _parent;
diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
index 41c48ffe15..8116274261 100644
--- a/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
+++ b/qpid/java/broker-plugins/derby-store/src/main/java/org/apache/qpid/server/store/derby/DerbyUtils.java
@@ -33,8 +33,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.server.store.StoreException;
 
@@ -46,7 +46,7 @@ public class DerbyUtils
     private static final String TABLE_EXISTENCE_QUERY = "SELECT 1 FROM SYS.SYSTABLES WHERE TABLENAME = ?";
     private static final Charset UTF8_CHARSET = Charset.forName("UTF-8");
 
-    private static final Logger DERBY_LOG = Logger.getLogger("DERBY");
+    private static final Logger DERBY_LOG = LoggerFactory.getLogger("DERBY");
     public static final DerbyLogWriter DERBY_LOG_WRITER = new DerbyLogWriter();
     public static final String DERBY_STREAM_ERROR_METHOD = "derby.stream.error.method";
 
@@ -203,22 +203,23 @@ public class DerbyUtils
                 // we simply have to assume everything is a warning except known startup / shutdown messages
                 // which we match using known prefixes.
 
-                Level logLevel = Level.WARN;
-
                 if(logMessage.startsWith(DERBY_STARTUP_MESSAGE)
                    || logMessage.startsWith(DERBY_SHUTDOWN_MESSAGE))
                 {
-                    logLevel = Level.INFO;
+                    DERBY_LOG.info(logMessage);
                 }
                 else if(logMessage.startsWith(DERBY_SYSTEM_HOME)
                    || logMessage.startsWith(DERBY_STREAM_ERROR_METHOD)
                    || logMessage.startsWith("java.vendor")
                    || logMessage.startsWith(DERBY_CLASS_LOADER_STARTED_MESSAGE))
                 {
-                    logLevel = Level.DEBUG;
+                    DERBY_LOG.debug(logMessage);
+                }
+                else
+                {
+                    DERBY_LOG.warn(logMessage);
                 }
 
-                DERBY_LOG.log(logLevel, logMessage);
             }
             _threadLocalBuffer.set(new StringBuilder());
         }