4 files changed, 63 insertions, 37 deletions
diff --git a/java/broker-plugins/build.xml b/java/broker-plugins/build.xml
deleted file mode 100644
index bf793fea70..0000000000
--- a/java/broker-plugins/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
-nn - or more contributor license agreements.  See the NOTICE file
- -n 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.
- -
- -->
-<project name="AMQ Broker-Plugins" default="build">
-
-    <property name="module.depends" value="client management/common broker common junit-toolkit"/>
-    <property name="module.plugin" value="true"/>
-
-    <import file="../module.xml"/>
-
-    <target name="build">
-     <subant target="jar">
-      <filelist dir=".">
-        <file name="extras/build.xml"/>
-      </filelist>
-     </subant>
-    </target>
-    
-</project>
diff --git a/java/broker-plugins/extras/build.xml b/java/broker-plugins/extras/build.xml
index b8e3aa1ef2..7d8468d5d5 100644
--- a/java/broker-plugins/extras/build.xml
+++ b/java/broker-plugins/extras/build.xml
@@ -20,7 +20,8 @@ nn - or more contributor license agreements.  See the NOTICE file
  -->
 <project name="AMQ Broker-Plugins" default="build">
 
-    <property name="module.depends" value="client management/common broker common junit-toolkit"/>
+    <property name="module.depends" value="common client management/common broker broker-plugins junit-toolkit"/>
+    <property name="module.test.depends" value="broker/test"/>
     <property name="module.manifest" value="MANIFEST.MF"/>
     <property name="module.plugin" value="true"/>
 
diff --git a/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java b/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
new file mode 100644
index 0000000000..1fc0eb10e1
--- /dev/null
+++ b/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/PluginTest.java
@@ -0,0 +1,61 @@
+/*
+ *
+ * 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.plugins;
+
+import java.util.Map;
+
+import org.apache.qpid.server.exchange.ExchangeType;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+
+import junit.framework.TestCase;
+
+public class PluginTest extends TestCase
+{
+
+    private static final String TEST_EXCHANGE_CLASS = "org.apache.qpid.extras.exchanges.example.TestExchangeType";
+    private static final String PLUGIN_DIRECTORY = System.getProperty("example.plugin.target");
+
+    public void testLoadExchanges() throws Exception
+    {
+        PluginManager manager = new PluginManager(PLUGIN_DIRECTORY);
+        Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
+        assertNotNull("No exchanges found in "+PLUGIN_DIRECTORY, exchanges);
+        assertEquals("Wrong number of exchanges found in "+PLUGIN_DIRECTORY, 
+                     2, exchanges.size());
+        assertNotNull("Wrong exchange found in "+PLUGIN_DIRECTORY,
+                      exchanges.get(TEST_EXCHANGE_CLASS));
+    } 
+    
+    public void testNoExchanges() throws Exception
+    {
+        PluginManager manager = new PluginManager("/path/to/nowhere");
+        Map<String, ExchangeType<?>> exchanges = manager.getExchanges();
+        assertEquals("Exchanges found", 0, exchanges.size());
+    }
+
+    @Override
+    public void tearDown()
+    {
+        // PluginManager will start an ApplicationRegistry instance. 
+        ApplicationRegistry.remove(ApplicationRegistry.DEFAULT_INSTANCE);
+    }
+}
diff --git a/java/broker-plugins/src/main/java/.gitignore b/java/broker-plugins/src/main/java/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/java/broker-plugins/src/main/java/.gitignore
+++ /dev/null