QPID-2585: Upgrade Felix to 2.0.5

Applied patch from Andrew Kennedy <andrew.international@gmail.com>


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

1 files changed, 14 insertions, 9 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java b/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
index 9599848dde..a64ec5d3b1 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/plugins/MockPluginManager.java
@@ -19,22 +19,21 @@
 package org.apache.qpid.server.plugins;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
 import org.apache.qpid.server.exchange.ExchangeType;
-import org.apache.qpid.server.security.access.ACLPlugin;
-import org.apache.qpid.server.security.access.ACLPluginFactory;
-import org.apache.qpid.server.security.access.QueueDenier;
+import org.apache.qpid.server.security.SecurityPluginFactory;
 
 public class MockPluginManager extends PluginManager
 {
+    private Map<String, SecurityPluginFactory> _securityPlugins = new HashMap<String, SecurityPluginFactory>();
+    private Map<List<String>, ConfigurationPluginFactory> _configPlugins = new HashMap<List<String>, ConfigurationPluginFactory>();
 
-    private Map<String, ACLPluginFactory> _securityPlugins = new HashMap<String, ACLPluginFactory>();
-
-    public MockPluginManager(String plugindir) throws Exception
+    public MockPluginManager(String pluginPath, String cachePath) throws Exception
     {
-        super(plugindir);
-        _securityPlugins.put("org.apache.qpid.server.security.access.QueueDenier", QueueDenier.FACTORY);
+        super(pluginPath, cachePath);
     }
 
     @Override
@@ -44,8 +43,14 @@ public class MockPluginManager extends PluginManager
     }
 
     @Override
-    public Map<String, ACLPluginFactory> getSecurityPlugins()
+    public Map<String, SecurityPluginFactory> getSecurityPlugins()
     {
         return _securityPlugins;
     }
+
+    @Override
+    public Map<List<String>, ConfigurationPluginFactory> getConfigurationPlugins()
+    {
+        return _configPlugins;
+    }
 }