Author: ritchiem
Date: Tue May 18 14:43:22 2010
New Revision: 945679
URL: http://svn.apache.org/viewvc?rev=945679&view=rev
Log:
QPID-2585 : Ensure plugins are correctly loaded, so can renenable PluginTest.
(Patch provided by Andrew Kennedy)
Modified:
qpid/trunk/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
Modified:
qpid/trunk/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java?rev=945679&r1=945678&r2=945679&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
Tue May 18 14:43:22 2010
@@ -47,7 +47,7 @@ public class PluginTest extends TestCase
properties.addProperty("plugin-directory", PLUGIN_DIRECTORY);
ServerConfiguration config = new ServerConfiguration(properties);
- // This Test requries an application Registry
+ // This Test requires an application Registry
ApplicationRegistry.initialise(new TestApplicationRegistry(config));
_registry = ApplicationRegistry.getInstance();
}
@@ -59,7 +59,7 @@ public class PluginTest extends TestCase
}
- public void disabled_testLoadExchanges() throws Exception
+ public void testLoadExchanges() throws Exception
{
PluginManager manager = _registry.getPluginManager();
Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=945679&r1=945678&r2=945679&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
Tue May 18 14:43:22 2010
@@ -21,9 +21,9 @@ package org.apache.qpid.server.plugins;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.felix.framework.Felix;
-import org.apache.felix.framework.cache.BundleCache;
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.StringMap;
+import org.apache.felix.main.AutoProcessor;
import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
import org.apache.qpid.server.exchange.ExchangeType;
import org.apache.qpid.server.security.access.ACLPlugin;
@@ -120,11 +120,11 @@ public class PluginManager
if (dir.isDirectory())
{
- for (String child : dir.list())
+ for (File child : dir.listFiles())
{
- if (child.endsWith("jar"))
+ if (child.getName().endsWith("jar"))
{
- pluginJars.append(String.format(" file:%s%s%s", plugindir,
File.separator, child));
+ pluginJars.append(String.format(" file:%s%s%s", plugindir,
File.separator, child.getName()));
}
}
}
@@ -137,8 +137,8 @@ public class PluginManager
// configMap.put(FelixConstants.AUTO_START_PROP + ".1",
pluginJars.toString());
// configMap.put(BundleCache.CACHE_PROFILE_DIR_PROP, plugindir);
- configMap.put("felix.auto.start.1", pluginJars.toString());
- configMap.put("felix.shutdown.hook","false");
+ configMap.put(AutoProcessor.AUTO_START_PROP + ".1",
pluginJars.toString());
+
configMap.put(FelixConstants.FRAMEWORK_STORAGE, plugindir);
@@ -154,6 +154,9 @@ public class PluginManager
_felix.start();
+
+ AutoProcessor.process(configMap, _felix.getBundleContext());
+
System.out.println("Started Plugin manager");
_exchangeTracker = new ServiceTracker(_activator.getContext(),
ExchangeType.class.getName(), null);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
