QPID-2531, QPID-2530 : Applied patches from Sorin Suciu to refactor broker-plugins directory and link new OSGi plugins to build system.

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

9 files changed, 41 insertions, 1 deletions

diff --git a/java/broker-plugins/build.xml b/java/broker-plugins/build.xml
index b12b3e3132..bf793fea70 100644
--- a/java/broker-plugins/build.xml
+++ b/java/broker-plugins/build.xml
@@ -21,9 +21,16 @@ 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.manifest" value="MANIFEST.MF"/>
     <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/MANIFEST.MF b/java/broker-plugins/extras/MANIFEST.MF
index e682614ed4..e682614ed4 100644
--- a/java/broker-plugins/MANIFEST.MF
+++ b/java/broker-plugins/extras/MANIFEST.MF
diff --git a/java/broker-plugins/extras/build.xml b/java/broker-plugins/extras/build.xml
new file mode 100644
index 0000000000..b8e3aa1ef2
--- /dev/null
+++ b/java/broker-plugins/extras/build.xml
@@ -0,0 +1,31 @@
+<!--
+ -
+ - 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.manifest" value="MANIFEST.MF"/>
+    <property name="module.plugin" value="true"/>
+
+    <import file="../../module.xml"/>
+
+    <target name="bundle" depends="bundle-tasks"/>
+
+</project>
diff --git a/java/broker-plugins/src/main/java/org/apache/qpid/extras/Activator.java b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
index ca6c05a435..ca6c05a435 100644
--- a/java/broker-plugins/src/main/java/org/apache/qpid/extras/Activator.java
+++ b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java
diff --git a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
index b497f192d6..b497f192d6 100644
--- a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
+++ b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java
diff --git a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
index b4d0d1aa0d..b4d0d1aa0d 100644
--- a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
+++ b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java
diff --git a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
index ace30b9b89..ace30b9b89 100644
--- a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
+++ b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java
diff --git a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
index db02ca13ea..db02ca13ea 100644
--- a/java/broker-plugins/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
+++ b/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java
diff --git a/java/build.deps b/java/build.deps
index b0b6cbe018..f7b26e93d0 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -85,6 +85,8 @@ broker.libs=${common.libs} ${commons-cli} ${commons-logging} ${log4j} \
     ${xalan} ${felix.libs} ${derby-db} ${commons-configuration.libs}
 
 broker-plugins.libs=${common.libs} ${felix.libs}  ${log4j} ${commons-configuration.libs}
+broker-plugins-info.libs=${common.libs} ${felix.libs}  ${log4j} ${commons-configuration.libs}
+broker-plugins-extras.libs=${common.libs} ${felix.libs}  ${log4j} ${commons-configuration.libs}
 management-client.libs=${jsp.libs} ${log4j} ${slf4j-log4j} ${slf4j-api} ${commons-pool} ${geronimo-servlet} ${muse.libs} ${javassist} ${xalan} ${mina-core} ${mina-filter-ssl}
 
 management-agent.libs=${client.libs} ${commons-logging} ${geronimo-jms}