From 378a7020fdb911c2009fa5846f554cd8dbf14b39 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Thu, 3 Jun 2010 21:26:59 +0000
Subject: Remove Plugin.isConfigured Only configured plugins should be created

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@951158 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/qpid/server/plugins/Plugin.java     | 10 ++++------
 .../qpid/server/security/AbstractPlugin.java       | 23 ++++++----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'qpid/java/broker/src')

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
index 27bb050db4..e094422a1e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
@@ -25,12 +25,10 @@ public interface Plugin
 {
 
     /**
-     * Is this plugin configured?.
-     */
-    boolean isConfigured();
-    
-    /**
-     * Configure this plugin
+     * Provide Configuration to this plugin
+     *
+     * FIXME Should not throw ConfigurationException,
+     * Only ConfigurationPlugin should throw ConfigurationException 
      */
     public void configure(ConfigurationPlugin config) throws ConfigurationException;
 }
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
index e0813b1fa7..87cc6e89aa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.server.security;
 
+import org.apache.commons.configuration.ConfigurationException;
 import org.apache.log4j.Logger;
 import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
 import org.apache.qpid.server.security.access.ObjectProperties;
@@ -33,7 +34,7 @@ public abstract class AbstractPlugin implements SecurityPlugin
 {
 	protected final Logger _logger = Logger.getLogger(getClass());
     
-    public ConfigurationPlugin _config;
+    protected ConfigurationPlugin _config;
 	
 	public Result getDefault()
 	{
@@ -43,22 +44,10 @@ public abstract class AbstractPlugin implements SecurityPlugin
     public abstract Result access(ObjectType object, Object instance);
 
     public abstract Result authorise(Operation operation, ObjectType object, ObjectProperties properties);
-    
-    public boolean isConfigured()
-    {
-        if (_config == null)
-        {
-            return false;
-        }
-        
-        for (String key : _config.getElementsProcessed())
-        {
-            if (!_config.getConfig().containsKey(key) && _config.getConfig().subset(key).isEmpty())
-            {
-                return false;
-            }
-        }
 
-        return true;
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
+    {
+        _config = config;
     }
+
 }
-- 
cgit v1.2.1