diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-08-01 13:34:11 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-08-01 13:34:11 +0000 |
| commit | 326741e927301ccf036a3ec98718bc622ca9e435 (patch) | |
| tree | cfabe8a5b265e200041cd43d44d94fabc4b0c600 /java/broker/bin | |
| parent | 59f5427b7f2b9f6959aebf257b1e6f11d237b03d (diff) | |
| download | qpid-python-326741e927301ccf036a3ec98718bc622ca9e435.tar.gz | |
Fix for a bug in the Broker Tools, preventing them working.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@561794 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/bin')
| -rwxr-xr-x | java/broker/bin/msTool.sh | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/java/broker/bin/msTool.sh b/java/broker/bin/msTool.sh index 4d55ee7811..73b1eb2ec7 100755 --- a/java/broker/bin/msTool.sh +++ b/java/broker/bin/msTool.sh @@ -18,9 +18,6 @@ # under the License. # -# Set classpath to include Qpid jar with all required jars in manifest -QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar - die() { if [[ $1 = -usage ]]; then shift @@ -39,18 +36,25 @@ if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then cygwin=true fi +if [ -z "$QPID_TOOLS" ]; then + if [ -z "$QPID_HOME" ]; then + die "QPID_TOOLS must be set" + else + QPID_TOOLS=$QPID_HOME + fi +fi + if $cygwin; then QPID_TOOLS=$(cygpath -w $QPID_TOOLS) fi +# Set classpath to include Qpid jar with all required jars in manifest +QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar + # Set other variables used by the qpid-run script before calling export JAVA=java \ JAVA_VM=-server \ JAVA_OPTS=-Dlog4j.configuration=file:$QPID_TOOLS/etc/mstool-log4j.xml \ QPID_CLASSPATH=$QPID_LIBS -if [ -z "$QPID_TOOLS" ]; then - die "QPID_TOOLS be set" -fi - . qpid-run org.apache.qpid.tools.messagestore.MessageStoreTool "$@" |