QPID-5611 : Change the event logger from a singleton to an instance

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

6 files changed, 31 insertions, 45 deletions

diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
index f87374ac80..09ffb71519 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/AbstractConfiguration.java
@@ -20,16 +20,20 @@
  */
 package org.apache.qpid.server.security.access.config;
 
+import org.apache.qpid.server.logging.EventLogger;
+
 import java.io.File;
 
 public abstract class AbstractConfiguration implements ConfigurationFile
 {
     private File _file;
     private RuleSet _config;
-    
-    public AbstractConfiguration(File file)
+    private final EventLogger _eventLogger;
+
+    public AbstractConfiguration(File file, final EventLogger eventLogger)
     {
         _file = file;
+        _eventLogger = eventLogger;
     }
     
     public File getFile()
@@ -39,7 +43,7 @@ public abstract class AbstractConfiguration implements ConfigurationFile
     
     public RuleSet load()
     {
-        _config = new RuleSet();
+        _config = new RuleSet(_eventLogger);
         return _config;
     }
     
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 34585bb4f6..df5b66da84 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
@@ -35,6 +35,7 @@ import java.util.Stack;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.security.access.ObjectType;
 import org.apache.qpid.server.security.access.Operation;
 import org.apache.qpid.server.security.access.Permission;
@@ -67,9 +68,9 @@ public class PlainConfiguration extends AbstractConfiguration
 
     private StreamTokenizer _st;
 
-    public PlainConfiguration(File file)
+    public PlainConfiguration(File file, final EventLogger eventLogger)
     {
-        super(file);
+        super(file, eventLogger);
     }
 
     @Override
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 58f3c71c7c..6e9bc590f4 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
@@ -38,7 +38,7 @@ import javax.security.auth.Subject;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.qpid.server.logging.SystemLog;
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.messages.AccessControlMessages;
 import org.apache.qpid.server.security.Result;
 import org.apache.qpid.server.security.access.ObjectProperties;
@@ -70,9 +70,11 @@ public class RuleSet
     private final Map<Subject, Map<Operation, Map<ObjectType, List<Rule>>>> _cache =
                         new WeakHashMap<Subject, Map<Operation, Map<ObjectType, List<Rule>>>>();
     private final Map<String, Boolean> _config = new HashMap<String, Boolean>();
+    private final EventLogger _eventLogger;
 
-    public RuleSet()
+    public RuleSet(EventLogger eventLogger)
     {
+        _eventLogger = eventLogger;
         // set some default configuration properties
         configure(DEFAULT_DENY, Boolean.TRUE);
     }
@@ -321,14 +323,14 @@ public class RuleSet
                 switch (permission)
                 {
                     case ALLOW_LOG:
-                        SystemLog.message(AccessControlMessages.ALLOWED(
+                        _eventLogger.message(AccessControlMessages.ALLOWED(
                                 action.getOperation().toString(),
                                 action.getObjectType().toString(),
                                 action.getProperties().toString()));
                     case ALLOW:
                         return Result.ALLOWED;
                     case DENY_LOG:
-                        SystemLog.message(AccessControlMessages.DENIED(
+                        _eventLogger.message(AccessControlMessages.DENIED(
                                 action.getOperation().toString(),
                                 action.getObjectType().toString(),
                                 action.getProperties().toString()));
@@ -437,4 +439,9 @@ public class RuleSet
         }
         return objects;
     }
+
+    public EventLogger getEventLogger()
+    {
+        return _eventLogger;
+    }
 }
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
deleted file mode 100644
index a4f6f8b65a..0000000000
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/XMLConfiguration.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- */
-package org.apache.qpid.server.security.access.config;
-
-import java.io.File;
-
-public class XMLConfiguration extends AbstractConfiguration
-{
-    public XMLConfiguration(File file)
-    {
-        super(file);
-    }
-}
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 f579ea0ec5..b56cd7c077 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
@@ -34,6 +34,7 @@ import org.apache.commons.lang.ObjectUtils;
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
 import org.apache.qpid.server.connection.ConnectionPrincipal;
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.security.Result;
 import org.apache.qpid.server.security.AccessControl;
 import org.apache.qpid.server.security.access.ObjectProperties;
@@ -49,9 +50,11 @@ public class DefaultAccessControl implements AccessControl
 
     private RuleSet _ruleSet;
     private File _aclFile;
+    private final EventLogger _eventLogger;
 
-    public DefaultAccessControl(String fileName)
+    public DefaultAccessControl(String fileName, final EventLogger eventLogger)
     {
+        _eventLogger = eventLogger;
         if (_logger.isDebugEnabled())
         {
             _logger.debug("Creating AccessControl instance using file: " + fileName);
@@ -63,6 +66,7 @@ public class DefaultAccessControl implements AccessControl
     DefaultAccessControl(RuleSet rs) throws ConfigurationException
     {
         _ruleSet = rs;
+        _eventLogger = rs.getEventLogger();
     }
 
     public void open()
@@ -74,7 +78,7 @@ public class DefaultAccessControl implements AccessControl
                 throw new IllegalConfigurationException("ACL file '" + _aclFile + "' is not found");
             }
 
-            ConfigurationFile configFile = new PlainConfiguration(_aclFile);
+            ConfigurationFile configFile = new PlainConfiguration(_aclFile, _eventLogger);
             _ruleSet = configFile.load();
         }
     }
@@ -103,7 +107,7 @@ public class DefaultAccessControl implements AccessControl
             }
 
             //verify it is parsable
-            new PlainConfiguration(_aclFile).load();
+            new PlainConfiguration(_aclFile, _eventLogger).load();
         }
     }
 
diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
index f4e041a8d2..af3b456083 100644
--- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
+++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/DefaultAccessControlFactory.java
@@ -30,6 +30,7 @@ import java.util.Collections;
 import java.util.Map;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.plugin.AccessControlFactory;
 import org.apache.qpid.server.security.AccessControl;
 import org.apache.qpid.server.util.ResourceBundleLoader;
@@ -43,7 +44,7 @@ public class DefaultAccessControlFactory implements AccessControlFactory
             PATH
             ));
 
-    public AccessControl createInstance(Map<String, Object> attributes)
+    public AccessControl createInstance(Map<String, Object> attributes, final EventLogger eventLogger)
     {
         if(attributes == null || !ACL_FILE_PROVIDER_TYPE.equals(attributes.get(ATTRIBUTE_TYPE)))
         {
@@ -56,7 +57,7 @@ public class DefaultAccessControlFactory implements AccessControlFactory
             throw new IllegalConfigurationException("Path to ACL was not specified!");
         }
 
-        return new DefaultAccessControl(path);
+        return new DefaultAccessControl(path, eventLogger);
     }
 
     @Override