summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2011-09-30 13:38:04 +0000
committerRobert Gemmell <robbie@apache.org>2011-09-30 13:38:04 +0000
commit867f1a8752891a07311de40d6133c47ee000e97c (patch)
tree59c1c0c4d87373e1db88891ba5caab4dafae517b
parent4ef8c1c78d62e6c8d014c69ced091090a07858b6 (diff)
downloadqpid-python-867f1a8752891a07311de40d6133c47ee000e97c.tar.gz
QPID-3504: make the broker start script check for additional jar files in lib/opt/ to add to its classpath using the JDK 6 classpath expansion convenience, enabling an easier way of adding the optional BDB JE jar dependency than via the existing -run:<option> classpath manipulations
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1177656 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xjava/broker/bin/qpid-server4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server
index 90b11da202..8814824e66 100755
--- a/java/broker/bin/qpid-server
+++ b/java/broker/bin/qpid-server
@@ -33,8 +33,8 @@ if [ -z "$QPID_PNAME" ]; then
export QPID_PNAME=" -DPNAME=QPBRKR"
fi
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
+# 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 other variables used by the qpid-run script before calling
export JAVA=java \