diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-09-23 23:54:06 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-09-23 23:54:06 +0000 |
| commit | 24b9814ed99bd4e657d08e4bb67c6d3dd7a48aaf (patch) | |
| tree | 2a5f96f49502bd824ae45c72411230bcf6fbb7d7 /qpid/java/broker | |
| parent | f0261d72e3f630feda33958e1ce171e98456ea1c (diff) | |
| download | qpid-python-24b9814ed99bd4e657d08e4bb67c6d3dd7a48aaf.tar.gz | |
QPID-5164: remove use of qpid-all.jar from scripts, use classpath wildcard expansion to pick up .jar files in the dir instead
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525752 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker')
| -rw-r--r-- | qpid/java/broker/bin/qpid-passwd | 4 | ||||
| -rw-r--r-- | qpid/java/broker/bin/qpid-server | 4 | ||||
| -rw-r--r-- | qpid/java/broker/bin/qpid-server.bat | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/qpid/java/broker/bin/qpid-passwd b/qpid/java/broker/bin/qpid-passwd index 69246974fa..cc55c7e2f2 100644 --- a/qpid/java/broker/bin/qpid-passwd +++ b/qpid/java/broker/bin/qpid-passwd @@ -23,8 +23,8 @@ if [ -z "$QPID_HOME" ]; then export QPID_HOME=`cd "$WHEREAMI/../" && pwd` 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 jars from lib dir +QPID_LIBS=$QPID_HOME/lib/* # Set other variables used by the qpid-run script before calling export JAVA=java \ diff --git a/qpid/java/broker/bin/qpid-server b/qpid/java/broker/bin/qpid-server index 206ae6a225..a922e0bdba 100644 --- 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, 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 classpath to include the jars in lib/, lib/plugins, and lib/opt +QPID_LIBS="$QPID_HOME/lib/*:$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/bin/qpid-server.bat b/qpid/java/broker/bin/qpid-server.bat index 96965b0b42..ea76a54479 100644 --- a/qpid/java/broker/bin/qpid-server.bat +++ b/qpid/java/broker/bin/qpid-server.bat @@ -76,8 +76,8 @@ echo Using CLASSPATH: %CLASSPATH% goto afterQpidClasspath
:noQpidClasspath
-echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\qpid-all.jar;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
-set CLASSPATH=%QPID_HOME%\lib\qpid-all.jar;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
+echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\*;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
+set CLASSPATH=%QPID_HOME%\lib\*;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
:afterQpidClasspath
REM start parsing -run arguments
|