diff options
| author | Rajith Muditha Attapattu <rajith@apache.org> | 2011-07-15 04:43:44 +0000 |
|---|---|---|
| committer | Rajith Muditha Attapattu <rajith@apache.org> | 2011-07-15 04:43:44 +0000 |
| commit | d58b837942a135533f3ec576a133c7ceecad3eee (patch) | |
| tree | dd86ceaa1ea0056b4c96af2b966f9cc18658618c /qpid/java/tools/bin/qpid-bench | |
| parent | 665fd64f84261d3bb9342b00f7f7823f367e3981 (diff) | |
| download | qpid-python-d58b837942a135533f3ec576a133c7ceecad3eee.tar.gz | |
QPID-3358 Simplified the scripts to make it easy to run them.
1. Removed the various set-env scripts. Instead in their place I want to introduce profiles that sets the env to
run under different environments. Ex from a source checkout or installed rpms.
2. Introduced Profile-run-from-source to set the env to run the tools
from an SVN checkout in a linux env.
3. Modified the scripts to use common variable names things like
classpaths, java executable, logging config etc..
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1146959 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/tools/bin/qpid-bench')
| -rwxr-xr-x[-rw-r--r--] | qpid/java/tools/bin/qpid-bench | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/qpid/java/tools/bin/qpid-bench b/qpid/java/tools/bin/qpid-bench index c982e64efd..cd894b607f 100644..100755 --- a/qpid/java/tools/bin/qpid-bench +++ b/qpid/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 "$@" |