From ebfd9ff053b04ab379acfc0fefedee5a31b6d8a5 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Fri, 21 Oct 2011 01:19:00 +0000 Subject: Undo bad merge from trunk - merged at wrong level. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/bin/qpid-server | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'java/broker/bin/qpid-server') diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server index 382004c9f5..90b11da202 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 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 Qpid jar with all required jars in manifest +QPID_LIBS=$QPID_HOME/lib/qpid-all.jar # Set other variables used by the qpid-run script before calling export JAVA=java \ @@ -51,6 +51,6 @@ QPID_OPTS="$QPID_OPTS -Damqj.read_write_pool_size=32 -DQPID_LOG_APPEND=$QPID_LOG if [ -z "$QPID_PID_FILENAME" ]; then export QPID_PID_FILENAME="qpid-server.pid" fi -echo $$ > "${QPID_WORK}/${QPID_PID_FILENAME}" +echo $$ > ${QPID_WORK}/${QPID_PID_FILENAME} -. "${QPID_HOME}/bin/qpid-run" org.apache.qpid.server.Main "$@" +. ${QPID_HOME}/bin/qpid-run org.apache.qpid.server.Main "$@" -- cgit v1.2.1