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
---
 qpid/java/module.xml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'qpid/java/module.xml')

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