You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2010/06/02 18:47:34 UTC

svn commit: r950656 - in /qpid/trunk/qpid/java: broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/ broke...

Author: ritchiem
Date: Wed Jun  2 16:47:34 2010
New Revision: 950656

URL: http://svn.apache.org/viewvc?rev=950656&view=rev
Log:
QPID-2581 : Update Plugins to have a consistent configure(ConfigurationPlugin config) method.
Further work is required to ensure that all ConfigurationPlugins perform config validation rather than leaving that to the plugin.
The plugin should just use the config.

Modified:
    qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
    qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java
    qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
    qpid/trunk/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
    qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java

Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java Wed Jun  2 16:47:34 2010
@@ -60,17 +60,12 @@ public class AccessControl extends Abstr
 
         public AccessControl newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
-            AccessControl plugin = new AccessControl(config);
-            plugin.configure();
+            AccessControl plugin = new AccessControl();
+            plugin.configure(config);
             return plugin;
         }
     };
-    
-    public AccessControl(ConfigurationPlugin config)
-    {
-        _config = config.getConfiguration(AccessControlConfiguration.class);
-    }
-    
+
     public Result getDefault()
     {
         return _ruleSet.getDefault();
@@ -112,9 +107,9 @@ public class AccessControl extends Abstr
         return _ruleSet.check(principal.getName(), operation, objectType, properties);
     }
 
-    @Override
-    public void configure() throws ConfigurationException
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
+        _config = config.getConfiguration(AccessControlConfiguration.class);        
         AccessControlConfiguration accessConfig = (AccessControlConfiguration) _config;
             
         if (isConfigured())

Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/SlowConsumerDetection.java Wed Jun  2 16:47:34 2010
@@ -144,11 +144,6 @@ class SlowConsumerDetection extends Virt
         return false;
     }
 
-    public String getPluginName()
-    {
-        return SlowConsumerDetection.class.getName();
-    }
-
     public boolean isConfigured()
     {
         return _config != null && _virtualhost != null;

Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicy.java Wed Jun  2 16:47:34 2010
@@ -47,7 +47,9 @@ public class TopicDeletePolicy implement
             TopicDeletePolicyConfiguration config =
                     configuration.getConfiguration(TopicDeletePolicyConfiguration.class);
             
-            return new TopicDeletePolicy(config);
+            TopicDeletePolicy policy = new TopicDeletePolicy();
+            policy.configure(config);
+            return policy;
         }
 
         public String getPluginName()
@@ -61,11 +63,6 @@ public class TopicDeletePolicy implement
         }
     }
 
-    public TopicDeletePolicy(TopicDeletePolicyConfiguration config)
-    {
-        _configuration = config;
-    }
-
     public void performPolicy(AMQQueue q)
     {
         if (q == null)
@@ -131,21 +128,13 @@ public class TopicDeletePolicy implement
         return false;
     }
 
-    @Override
-    public String getPluginName()
-    {
-        return "topicdelete";
-    }
-
-    @Override
     public boolean isConfigured()
     {
         return _configuration != null;
     }
 
-    @Override
-    public void configure() throws ConfigurationException
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
-        // Empty
+        _configuration = (TopicDeletePolicyConfiguration) config;
     }
 }

Modified: qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/experimental/slowconsumerdetection/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/TopicDeletePolicyTest.java Wed Jun  2 16:47:34 2010
@@ -100,9 +100,10 @@ public class TopicDeletePolicyTest exten
 
 
     /** Check that a null queue passed in does not upset the policy. */
-    public void testNullQueueParameter()
+    public void testNullQueueParameter() throws ConfigurationException
     {
-        TopicDeletePolicy policy = new TopicDeletePolicy(_config);
+        TopicDeletePolicy policy = new TopicDeletePolicy();
+        policy.configure(_config);
 
         try
         {
@@ -119,9 +120,10 @@ public class TopicDeletePolicyTest exten
      * Set a owning Session to null which means this is not an exclusive queue
      * so the queue should not be deleted
      */
-    public void testNonExclusiveQueue()
+    public void testNonExclusiveQueue() throws ConfigurationException
     {
-        TopicDeletePolicy policy = new TopicDeletePolicy(_config);
+        TopicDeletePolicy policy = new TopicDeletePolicy();
+        policy.configure(_config);
 
         MockAMQQueue queue = createOwnedQueue();
 
@@ -139,9 +141,10 @@ public class TopicDeletePolicyTest exten
      *
      * JMS Queues are not to be processed so this should not delete the queue.
      */
-    public void testQueuesAreNotProcessed()
+    public void testQueuesAreNotProcessed() throws ConfigurationException
     {
-        TopicDeletePolicy policy = new TopicDeletePolicy(_config);
+        TopicDeletePolicy policy = new TopicDeletePolicy();
+        policy.configure(_config);
 
         MockAMQQueue queue = createOwnedQueue();
 
@@ -158,9 +161,10 @@ public class TopicDeletePolicyTest exten
      * Give a non auto-delete queue is bound to the topic exchange the
      * TopicDeletePolicy will close the connection and delete the queue,
      */
-    public void testNonAutoDeleteTopicIsNotClosed()
+    public void testNonAutoDeleteTopicIsNotClosed() throws ConfigurationException
     {
-        TopicDeletePolicy policy = new TopicDeletePolicy(_config);
+        TopicDeletePolicy policy = new TopicDeletePolicy();
+        policy.configure(_config);
 
         MockAMQQueue queue = createOwnedQueue();
 
@@ -178,9 +182,10 @@ public class TopicDeletePolicyTest exten
      * Give a auto-delete queue bound to the topic exchange the TopicDeletePolicy will
      * close the connection and delete the queue
      */
-    public void testTopicIsClosed()
+    public void testTopicIsClosed() throws ConfigurationException
     {
-        TopicDeletePolicy policy = new TopicDeletePolicy(_config);
+        TopicDeletePolicy policy = new TopicDeletePolicy();
+        policy.configure(_config);
 
         final MockAMQQueue queue = createOwnedQueue();
 
@@ -198,9 +203,10 @@ public class TopicDeletePolicyTest exten
      * Give a queue bound to the topic exchange the TopicDeletePolicy will
      * close the connection and NOT delete the queue
      */
-    public void testNonAutoDeleteTopicIsClosedNotDeleted() throws AMQException
+    public void testNonAutoDeleteTopicIsClosedNotDeleted() throws AMQException, ConfigurationException
     {
-        TopicDeletePolicy policy = new TopicDeletePolicy(_config);
+        TopicDeletePolicy policy = new TopicDeletePolicy();
+        policy.configure(_config);
 
         MockAMQQueue queue = createOwnedQueue();
 
@@ -217,12 +223,13 @@ public class TopicDeletePolicyTest exten
      * configured with the delete-persistent tag will close the connection
      * and delete the queue
      */
-    public void testPersistentTopicIsClosedAndDeleted()
+    public void testPersistentTopicIsClosedAndDeleted() throws ConfigurationException
     {
         //Set the config to delete persistent queues
         _config.getConfig().addProperty("delete-persistent", "");
 
-        TopicDeletePolicy policy = new TopicDeletePolicy(_config);
+        TopicDeletePolicy policy = new TopicDeletePolicy();
+        policy.configure(_config);
 
         assertTrue("Config was not updated to delete Persistent topics",
                    _config.deletePersistent());

Modified: qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java Wed Jun  2 16:47:34 2010
@@ -43,8 +43,8 @@ public class Firewall extends AbstractPl
     {
         public Firewall newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
-            Firewall plugin = new Firewall(config);
-            plugin.configure();
+            Firewall plugin = new Firewall();
+            plugin.configure(config);
             return plugin;
         }
         
@@ -118,19 +118,16 @@ public class Firewall extends AbstractPl
         }
     }
     
-    public Firewall(ConfigurationPlugin config)
-    {
-        _config = config.getConfiguration(FirewallConfiguration.class);
-    }
 
-    public void configure() throws ConfigurationException
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
-        FirewallConfiguration config = (FirewallConfiguration) _config;
+        _config = config.getConfiguration(FirewallConfiguration.class);
+        FirewallConfiguration firewallConfiguration = (FirewallConfiguration) _config;
         
         if (isConfigured())
         {
             // Get default action
-            String defaultAction = config.getConfiguration().getString("[@default-action]");
+            String defaultAction = firewallConfiguration.getConfiguration().getString("[@default-action]");
             if (defaultAction == null)
             {
                 _default = Result.ABSTAIN;
@@ -144,8 +141,8 @@ public class Firewall extends AbstractPl
                 _default = Result.DENIED;
             }
             
-            CompositeConfiguration finalConfig = new CompositeConfiguration(config.getConfiguration());
-            List subFiles = config.getConfiguration().getList("xml[@fileName]");
+            CompositeConfiguration finalConfig = new CompositeConfiguration(firewallConfiguration.getConfiguration());
+            List subFiles = firewallConfiguration.getConfiguration().getList("xml[@fileName]");
             for (Object subFile : subFiles)
             {
                 finalConfig.addConfiguration(new XMLConfiguration((String) subFile));

Modified: qpid/trunk/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallPluginTest.java Wed Jun  2 16:47:34 2010
@@ -119,9 +119,8 @@ public class FirewallPluginTest extends 
         // Configure plugin
         FirewallConfiguration config = new FirewallConfiguration();
         config.setConfiguration("", new XMLConfiguration(confFile));
-        Firewall plugin = new Firewall(config);
-        plugin._config = config;
-        plugin.configure();
+        Firewall plugin = new Firewall();
+        plugin.configure(config);
         return plugin;
     }
 

Modified: qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/simple-xml/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java Wed Jun  2 16:47:34 2010
@@ -52,8 +52,8 @@ public class SimpleXML extends AbstractP
     {
         public SimpleXML newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
-            SimpleXML plugin = new SimpleXML(config);
-            plugin.configure();
+            SimpleXML plugin = new SimpleXML();
+            plugin.configure(config);
             return plugin;
         }
 
@@ -68,20 +68,17 @@ public class SimpleXML extends AbstractP
         }
     };
 
-    public SimpleXML(ConfigurationPlugin config) throws ConfigurationException
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
         _config = config.getConfiguration(SimpleXMLConfiguration.class);
-    }
 
-    public void configure() throws ConfigurationException
-    {
-        SimpleXMLConfiguration config = (SimpleXMLConfiguration) _config;
+        SimpleXMLConfiguration configuration = (SimpleXMLConfiguration) _config;
         
         if (isConfigured())
         {
             _users = new ConcurrentHashMap<String, PrincipalPermissions>();
 
-            processConfig(config.getConfiguration());
+            processConfig(configuration.getConfiguration());
         }
     }
 

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/Plugin.java Wed Jun  2 16:47:34 2010
@@ -19,14 +19,11 @@
 package org.apache.qpid.server.plugins;
 
 import org.apache.commons.configuration.ConfigurationException;
+import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
 
 public interface Plugin
 {
-    /**
-     * The name of this plugin.
-     */
-    String getPluginName();
-    
+
     /**
      * Is this plugin configured?.
      */
@@ -35,5 +32,5 @@ public interface Plugin
     /**
      * Configure this plugin
      */
-    void configure() throws ConfigurationException;
+    public void configure(ConfigurationPlugin config) throws ConfigurationException;
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractPlugin.java Wed Jun  2 16:47:34 2010
@@ -35,11 +35,6 @@ public abstract class AbstractPlugin imp
     
     public ConfigurationPlugin _config;
 	
-    public String getPluginName()
-    {
-        return getClass().getSimpleName();
-    }
-	
 	public Result getDefault()
 	{
 		return Result.ABSTAIN;

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/AllowAll.java Wed Jun  2 16:47:34 2010
@@ -57,8 +57,8 @@ public class AllowAll extends BasicPlugi
     {
         public AllowAll newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
-            AllowAll plugin = new AllowAll(config);
-            plugin.configure();
+            AllowAll plugin = new AllowAll();
+            plugin.configure(config);
             return plugin;
         }
 
@@ -79,8 +79,8 @@ public class AllowAll extends BasicPlugi
 		return Result.ALLOWED;
     }
 
-    public AllowAll(ConfigurationPlugin config)
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
         _config = config.getConfiguration(AllowAllConfiguration.class);
-    }
+    }    
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/BasicPlugin.java Wed Jun  2 16:47:34 2010
@@ -31,7 +31,7 @@ import org.apache.qpid.server.security.a
 /**
  * This {@link SecurityPlugin} simply abstains from all authorisation requests and ignores configuration.
  */
-public class BasicPlugin extends AbstractPlugin
+public abstract class BasicPlugin extends AbstractPlugin
 {
     public Result access(ObjectType objectType, Object instance)
     {
@@ -42,10 +42,4 @@ public class BasicPlugin extends Abstrac
     {
         return getDefault();
     }
-
-    @Override
-    public void configure() throws ConfigurationException
-    {
-        // Not used
-    }
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/DenyAll.java Wed Jun  2 16:47:34 2010
@@ -57,8 +57,8 @@ public class DenyAll extends BasicPlugin
     {
         public DenyAll newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
-            DenyAll plugin = new DenyAll(config);
-            plugin.configure();
+            DenyAll plugin = new DenyAll();
+            plugin.configure(config);
             return plugin;
         }
 
@@ -79,8 +79,9 @@ public class DenyAll extends BasicPlugin
 		return Result.DENIED;
     }
 
-    public DenyAll(ConfigurationPlugin config) throws ConfigurationException
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
         _config = config.getConfiguration(DenyAllConfiguration.class);
     }
+
 }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java?rev=950656&r1=950655&r2=950656&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/LegacyAccess.java Wed Jun  2 16:47:34 2010
@@ -58,8 +58,8 @@ public class LegacyAccess extends BasicP
     {
         public LegacyAccess newInstance(ConfigurationPlugin config) throws ConfigurationException
         {
-            LegacyAccess plugin = new LegacyAccess(config);
-            plugin.configure();
+            LegacyAccess plugin = new LegacyAccess();
+            plugin.configure(config);
             return plugin;
         }
 
@@ -74,7 +74,7 @@ public class LegacyAccess extends BasicP
         }
     };
     
-    public LegacyAccess(ConfigurationPlugin config) throws ConfigurationException
+    public void configure(ConfigurationPlugin config) throws ConfigurationException
     {
         _config = config.getConfiguration(LegacyAccessConfiguration.class);
     }



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org