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

7 files changed, 23 insertions, 14 deletions

diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
index 45af85be6c..ebe6df126f 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AclRulePredicates.java
@@ -20,7 +20,9 @@ package org.apache.qpid.server.security.access.config;
 
 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.server.security.access.ObjectProperties;
 import org.apache.qpid.server.security.access.ObjectProperties.Property;
 import org.apache.qpid.server.security.access.firewall.FirewallRule;
@@ -32,7 +34,7 @@ import org.apache.qpid.server.security.access.firewall.FirewallRuleFactory;
  */
 public class AclRulePredicates
 {
-    private static final Logger _logger = Logger.getLogger(AclRulePredicates.class);
+    private static final Logger _logger = LoggerFactory.getLogger(AclRulePredicates.class);
 
     private static final String SEPARATOR = ",";
 
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
index 5ed28b679a..92b870f740 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/PlainConfiguration.java
@@ -32,7 +32,8 @@ import java.util.Map;
 import java.util.Stack;
 
 import org.apache.commons.lang.StringUtils;
-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.EventLoggerProvider;
@@ -42,7 +43,7 @@ import org.apache.qpid.server.security.access.Permission;
 
 public class PlainConfiguration implements ConfigurationFile
 {
-    private static final Logger _logger = Logger.getLogger(PlainConfiguration.class);
+    private static final Logger _logger = LoggerFactory.getLogger(PlainConfiguration.class);
 
     public static final Character COMMENT = '#';
     public static final Character CONTINUATION = '\\';
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
index fd122ef8d2..7661951d8b 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
@@ -37,7 +37,9 @@ import javax.security.auth.Subject;
 
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
-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.EventLoggerProvider;
 import org.apache.qpid.server.logging.messages.AccessControlMessages;
@@ -52,7 +54,7 @@ import org.apache.qpid.server.security.access.Permission;
  */
 public class RuleSet implements EventLoggerProvider
 {
-    private static final Logger _logger = Logger.getLogger(RuleSet.class);
+    private static final Logger _logger = LoggerFactory.getLogger(RuleSet.class);
 
     private static final String AT = "@";
     private static final String SLASH = "/";
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
index fb13426fbb..9d62c44658 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
@@ -30,11 +30,12 @@ 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;
 
 public class HostnameFirewallRule implements FirewallRule
 {
-    private static final Logger _logger = Logger.getLogger(HostnameFirewallRule.class);
+    private static final Logger _logger = LoggerFactory.getLogger(HostnameFirewallRule.class);
 
     private static final long DNS_TIMEOUT = 30000;
     private static final ExecutorService DNS_LOOKUP = Executors.newCachedThreadPool();
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
index ad619a0e0b..4d635a600e 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/NetworkFirewallRule.java
@@ -26,11 +26,12 @@ 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;
 
 public class NetworkFirewallRule implements FirewallRule
 {
-    private static final Logger _logger = Logger.getLogger(NetworkFirewallRule.class);
+    private static final Logger _logger = LoggerFactory.getLogger(NetworkFirewallRule.class);
 
     private List<InetNetwork> _networks;
 
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
index 99db75ac91..7023a9a03b 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
@@ -28,7 +28,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;
@@ -45,7 +46,7 @@ public class ACLFileAccessControlProviderImpl
         extends AbstractConfiguredObject<ACLFileAccessControlProviderImpl>
         implements ACLFileAccessControlProvider<ACLFileAccessControlProviderImpl>
 {
-    private static final Logger LOGGER = Logger.getLogger(ACLFileAccessControlProviderImpl.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ACLFileAccessControlProviderImpl.class);
 
     static
     {
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
index 2998252b51..8533166023 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControl.java
@@ -35,7 +35,8 @@ import java.util.Set;
 import javax.security.auth.Subject;
 
 import org.apache.commons.lang.ObjectUtils;
-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.connection.ConnectionPrincipal;
@@ -51,7 +52,7 @@ import org.apache.qpid.server.security.access.config.RuleSet;
 
 public class DefaultAccessControl implements AccessControl
 {
-    private static final Logger _logger = Logger.getLogger(DefaultAccessControl.class);
+    private static final Logger _logger = LoggerFactory.getLogger(DefaultAccessControl.class);
     private final String _fileName;
 
     private RuleSet _ruleSet;