From 5eb354b338bb8d8fcd35b6ac3fb33f8103e757c3 Mon Sep 17 00:00:00 2001
From: "Stephen D. Huston" <shuston@apache.org>
Date: Thu, 20 Oct 2011 18:42:46 +0000
Subject: Merge trunk to QPID-2519 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1186990 13f79535-47bb-0310-9956-ffa450edef68
---
 java/tools/bin/qpid-bench | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 java/tools/bin/qpid-bench

(limited to 'java/tools/bin/qpid-bench')

diff --git a/java/tools/bin/qpid-bench b/java/tools/bin/qpid-bench
old mode 100644
new mode 100755
index c982e64efd..cd894b607f
--- a/java/tools/bin/qpid-bench
+++ b/java/tools/bin/qpid-bench
@@ -18,18 +18,6 @@
 # under the License.
 #
 
-if [ -z "$QPID_HOME" ]; then
-    export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
-    export PATH=${PATH}:${QPID_HOME}/bin
-fi
+. check-qpid-java-env
 
-# 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 \
-       JAVA_VM=-server \
-       JAVA_MEM=-Xmx1024m \
-       QPID_CLASSPATH=$QPID_LIBS
-
-. qpid-run org.apache.qpid.tools.QpidBench "$@"
+$JAVA -cp $CLASSPATH -server $JAVA_MEM $LOG_CONFIG org.apache.qpid.tools.QpidBench "$@"
-- 
cgit v1.2.1