From efe7c8fb6ddd5cd7fa5881ca960a8ec92098887b Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Wed, 21 Nov 2012 23:27:07 +0000
Subject: QPID-4456: ensure the broker plugins get packaged in the release
 binary and added to the classpath. Create opt directory for later use by
 users and update docs accordingly.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1412359 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/java-broker/Java-Broker-Stores-BDB-Store.xml |  4 +---
 qpid/java/bdbstore/jmx/build.xml                     |  2 ++
 qpid/java/broker-plugins/access-control/build.xml    |  2 ++
 qpid/java/broker-plugins/management-http/build.xml   |  2 ++
 qpid/java/broker-plugins/management-jmx/build.xml    |  2 ++
 qpid/java/broker/bin/qpid-server                     |  4 ++--
 qpid/java/broker/build.xml                           | 10 ++++++++--
 qpid/java/common.xml                                 |  2 +-
 qpid/java/module.xml                                 | 20 +++++++-------------
 9 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml b/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
index 9ce90f6529..c16d9aa227 100644
--- a/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
+++ b/qpid/doc/book/src/java-broker/Java-Broker-Stores-BDB-Store.xml
@@ -52,16 +52,14 @@
     <title>Oracle BDB JE jar installation</title>
     <para>
       If you wish to use the BDBMessageStore, copy the je-&oracleBdbProductVersion;.jar from within the release
-      downloaded <link linkend="Java-Broker-Stores-BDB-Store-BDBJE-Download">above</link> into an 'opt' sub-directory
+      downloaded <link linkend="Java-Broker-Stores-BDB-Store-BDBJE-Download">above</link> into the 'opt' sub-directory
       of the brokers 'lib' directory.
     </para>
 
     <programlisting>Unix:
-mkdir qpid-broker-&qpidCurrentRelease;/lib/opt
 cp je-&oracleBdbProductVersion;.jar qpid-broker-&qpidCurrentRelease;/lib/opt</programlisting>
 
       <programlisting>Windows:
-mkdir qpid-broker-&qpidCurrentRelease;\lib\opt
 copy je-&oracleBdbProductVersion;.jar qpid-broker-&qpidCurrentRelease;\lib\opt</programlisting>
   </section>
 
diff --git a/qpid/java/bdbstore/jmx/build.xml b/qpid/java/bdbstore/jmx/build.xml
index e99a09f062..d3e9f63b46 100644
--- a/qpid/java/bdbstore/jmx/build.xml
+++ b/qpid/java/bdbstore/jmx/build.xml
@@ -23,6 +23,8 @@
     <property name="module.genpom" value="true"/>
     <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-broker-plugins-management-jmx=provided -Sqpid-management-common=provided -Sqpid-bdbstore=provided -Sje=provided"/>
 
+    <property name="broker.plugin" value="true"/>
+
     <import file="../../module.xml" />
 
     <target name="bundle" depends="bundle-tasks" />
diff --git a/qpid/java/broker-plugins/access-control/build.xml b/qpid/java/broker-plugins/access-control/build.xml
index 193eac4d3d..4debdcb95a 100644
--- a/qpid/java/broker-plugins/access-control/build.xml
+++ b/qpid/java/broker-plugins/access-control/build.xml
@@ -23,6 +23,8 @@
     <property name="module.genpom" value="true"/>
     <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/>
 
+    <property name="broker.plugin" value="true"/>
+
     <property name="broker-plugins-access-control.libs" value=""/>
 
     <import file="../../module.xml" />
diff --git a/qpid/java/broker-plugins/management-http/build.xml b/qpid/java/broker-plugins/management-http/build.xml
index 73fc3eb53a..734d762f17 100644
--- a/qpid/java/broker-plugins/management-http/build.xml
+++ b/qpid/java/broker-plugins/management-http/build.xml
@@ -24,6 +24,8 @@
     <property name="module.genpom" value="true" />
     <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided" />
 
+    <property name="broker.plugin" value="true"/>
+
     <property name="broker-plugins-management-http.libs" value="" />
 
     <import file="../../module.xml" />
diff --git a/qpid/java/broker-plugins/management-jmx/build.xml b/qpid/java/broker-plugins/management-jmx/build.xml
index 855514987b..9d212cf39a 100644
--- a/qpid/java/broker-plugins/management-jmx/build.xml
+++ b/qpid/java/broker-plugins/management-jmx/build.xml
@@ -23,6 +23,8 @@
     <property name="module.genpom" value="true"/>
     <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-management-common=provided"/>
 
+    <property name="broker.plugin" value="true"/>
+
     <property name="broker-plugins-management-jmx.libs" value=""/>
 
     <import file="../../module.xml" />
diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server
index 382004c9f5..206ae6a225 100755
--- a/qpid/java/broker/bin/qpid-server
+++ b/qpid/java/broker/bin/qpid-server
@@ -33,8 +33,8 @@ if [ -z "$QPID_PNAME" ]; then
     export QPID_PNAME=" -DPNAME=QPBRKR"
 fi
 
-# Set classpath to include the qpid-all manifest jar, and any jars supplied in lib/opt
-QPID_LIBS="$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/opt/*"
+# Set classpath to include the qpid-all manifest jar, plus jars in lib/plugins and lib/opt
+QPID_LIBS="$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/plugins/*:$QPID_HOME/lib/opt/*"
 
 # Set other variables used by the qpid-run script before calling
 export JAVA=java \
diff --git a/qpid/java/broker/build.xml b/qpid/java/broker/build.xml
index be845d466a..3c4a7d81c6 100644
--- a/qpid/java/broker/build.xml
+++ b/qpid/java/broker/build.xml
@@ -48,9 +48,15 @@
         <fixcrlf srcdir="${module.release}/bin" fixlast="true" eol="dos" includes="*.bat"/>
     </target>
 
-    <target name="release-bin-other" depends="release-bin-other-bdbstore" description="copy broker-plugins into module release">
+    <target name="release-bin-other" depends="release-bin-other-lib-opt,release-bin-other-bdbstore,release-bin-copy-broker-plugins"/>
+
+    <target name="release-bin-other-lib-opt" depends="release-bin-other-bdbstore" description="make lib/opt dir in the module release">
+        <mkdir dir="${module.release}/lib/opt"/>
+    </target>
+
+    <target name="release-bin-copy-broker-plugins" description="copy broker-plugins into module release">
         <copy todir="${module.release}/lib/plugins" failonerror="true">
-            <fileset dir="${build.lib}/plugins"/>
+            <fileset dir="${build.lib.broker.plugins}"/>
         </copy>
     </target>
 
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index 3ea685fa52..2360dcddb7 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -42,7 +42,7 @@
   <property name="build.report"          location="${build}/report"/>
   <property name="build.release"         location="${build}/release"/>
   <property name="build.release.prepare" location="${build.release}/prepare"/>
-  <property name="build.plugins"         location="${build}/lib/plugins"/>
+  <property name="build.lib.broker.plugins"  location="${build}/lib/broker-plugins"/>
   <property name="build.coverage.report" location="${build}/coverage/report"/>
   <property name="build.coverage.src"    location="${build}/coverage/src"/>
   <property name="build.findbugs"        location="${build}/findbugs"/>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 4d7475829d..26349fb41c 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -74,6 +74,7 @@
   <property name="broker.log.prefix" value="BROKER: "/> 
   <property name="broker.log.interleave" value="true"/>
 
+  <property name="module.jar"          location="${build.lib}/${project.name}-${module.name}-${project.version}.jar"/>
   <property name="module.qpid.jar"     location="${module.release.lib}/qpid-all.jar"/>
   <basename property="qpid.jar.name"  file="${module.qpid.jar}"/>
 
@@ -151,15 +152,6 @@
     <pathelement location="${module.test.src}"/>
   </path>
 
-  <condition property="module.jar"
-             value="${build.plugins}/${project.name}-${module.name}-${project.version}.jar"
-             else="${build.lib}/${project.name}-${module.name}-${project.version}.jar">
-    <and>
-      <isset property="module.plugin"/>
-      <istrue value="${module.plugin}"/>
-    </and>
-  </condition>
-
   <property name="module.test.jar"
             location="${build.lib}/${project.name}-${module.name}-tests-${project.version}.jar"/>
 
@@ -248,7 +240,7 @@
     <mkdir dir="${build.etc}"/>
     <mkdir dir="${build.lib}"/>
     <mkdir dir="${build.results}"/>
-    <mkdir dir="${build.plugins}"/>
+    <mkdir dir="${build.lib.broker.plugins}"/>
     <mkdir dir="${module.classes}"/>
     <mkdir dir="${module.precompiled}"/>
     <mkdir dir="${module.api}"/>
@@ -392,8 +384,6 @@
   <property name="QPID_HOME" value="${qpid.home}"/>
   <property name="QPID_WORK" value="${qpid.work}"/>
   <property name="broker.existing.qpid.work" value=""/>
-  <!-- Used by PluginTest -->
-  <property name="example.plugin.target" value="${project.root}/build/lib/plugins"/>
 
   <propertyset id="all.test.systemproperties">
     <propertyref prefix="test"/>
@@ -504,7 +494,7 @@
 
   <target name="postbuild" description="run after a build"/>
 
-  <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/>
+  <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild,copy-broker-plugin-jars" description="compile and copy resources into build tree"/>
 
   <target name="jar.manifest" depends="compile, copy-module-metainf" if="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}">
@@ -518,6 +508,10 @@
     </jar>
   </target>
 
+  <target name="copy-broker-plugin-jars" if="${broker.plugin}" description="copy broker plugins for use in release packaging">
+    <copy file="${module.jar}" todir="${build.lib.broker.plugins}" failonerror="true"/>
+  </target>
+
   <target name="copy-module-metainf" depends="copy-metainf-resources" if="module.src.resources.metainf.exists">
     <copy todir="${module.metainf}" failonerror="true">
         <fileset dir="${module.src.resources.metainf}"/>
-- 
cgit v1.2.1