diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-11-21 23:27:07 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-11-21 23:27:07 +0000 |
| commit | efe7c8fb6ddd5cd7fa5881ca960a8ec92098887b (patch) | |
| tree | d424048b80da202d7aec5430ceb7a16f27884e6a /qpid/java/broker | |
| parent | 5f281d36e17aa861767029f4dc5eefd7f1d1c559 (diff) | |
| download | qpid-python-efe7c8fb6ddd5cd7fa5881ca960a8ec92098887b.tar.gz | |
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
Diffstat (limited to 'qpid/java/broker')
| -rwxr-xr-x | qpid/java/broker/bin/qpid-server | 4 | ||||
| -rw-r--r-- | qpid/java/broker/build.xml | 10 |
2 files changed, 10 insertions, 4 deletions
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> |