summaryrefslogtreecommitdiff
path: root/java/broker/bin
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2007-07-05 12:40:50 +0000
committerMartin Ritchie <ritchiem@apache.org>2007-07-05 12:40:50 +0000
commit58bd497db4de68b04eb1c4eb4e21cf86c4ae3b29 (patch)
treeebd340eefa0a28c836137e526d006b5f6b1977b9 /java/broker/bin
parent7352d9c999fa9f5b62bbb0aa283e06f53bc35965 (diff)
downloadqpid-python-58bd497db4de68b04eb1c4eb4e21cf86c4ae3b29.tar.gz
Minor changes and tidy up when running via command line.
Added Copy command. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@553480 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/bin')
-rwxr-xr-xjava/broker/bin/msTool.sh28
1 files changed, 25 insertions, 3 deletions
diff --git a/java/broker/bin/msTool.sh b/java/broker/bin/msTool.sh
index 2f05e511c5..4d55ee7811 100755
--- a/java/broker/bin/msTool.sh
+++ b/java/broker/bin/msTool.sh
@@ -19,16 +19,38 @@
#
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
+QPID_LIBS=$QPID_TOOLS/lib/qpid-incubating.jar
+
+die() {
+ if [[ $1 = -usage ]]; then
+ shift
+ usage=true
+ else
+ usage=false
+ fi
+ echo "$@"
+ $usage && echo
+ $usage && usage
+ exit 1
+}
+
+cygwin=false
+if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then
+ cygwin=true
+fi
+
+if $cygwin; then
+ QPID_TOOLS=$(cygpath -w $QPID_TOOLS)
+fi
# Set other variables used by the qpid-run script before calling
export JAVA=java \
JAVA_VM=-server \
- JAVA_OPTS=-Dlog4j.configuration=$QPID_TOOLS\etc\messagestoretool-log4j.xml \
+ JAVA_OPTS=-Dlog4j.configuration=file:$QPID_TOOLS/etc/mstool-log4j.xml \
QPID_CLASSPATH=$QPID_LIBS
if [ -z "$QPID_TOOLS" ]; then
- die "QPID_HOME must be set"
+ die "QPID_TOOLS be set"
fi
. qpid-run org.apache.qpid.tools.messagestore.MessageStoreTool "$@"