From d6733e7ec196ed60fcc2039cf1eafc25cf48fbb6 Mon Sep 17 00:00:00 2001
From: Rajith Muditha Attapattu <rajith@apache.org>
Date: Sat, 30 Jul 2011 02:22:43 +0000
Subject: QPID-3358 Modified the run-sub and run-pub scripts to allow program
 args in addition to jvm args. This allows scripts to pass on varios arguments
 like a script specific prefix and other arguments that should be private to a
 particular connection rather than the entire jvm.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1152413 13f79535-47bb-0310-9956-ffa450edef68
---
 java/tools/bin/run-pub |  8 ++++++--
 java/tools/bin/run-sub | 11 +++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'java')

diff --git a/java/tools/bin/run-pub b/java/tools/bin/run-pub
index 1af58eede3..9efe58c4b8 100755
--- a/java/tools/bin/run-pub
+++ b/java/tools/bin/run-pub
@@ -20,5 +20,9 @@
 
 . check-qpid-java-env
 
-echo "$@"
-$JAVA -cp $CLASSPATH $LOG_CONFIG $JAVA_MEM $@ org.apache.qpid.tools.PerfProducer
+JVM_ARGS="$1"
+PROGRAM_ARGS="$2"
+
+echo "JVM ARGS : $JAVA_MEM $JVM_ARGS"
+echo "PROGRAM ARGS : $PROGRAM_ARGS"
+$JAVA -cp $CLASSPATH $LOG_CONFIG $JAVA_MEM $JVM_ARGS org.apache.qpid.tools.PerfProducer $PROGRAM_ARGS
diff --git a/java/tools/bin/run-sub b/java/tools/bin/run-sub
index e9eea5197e..8449563f7f 100755
--- a/java/tools/bin/run-sub
+++ b/java/tools/bin/run-sub
@@ -20,6 +20,13 @@
 
 . check-qpid-java-env
 
-echo "$@"
-$JAVA -cp $CLASSPATH $LOG_CONFIG $JAVA_MEM $@ org.apache.qpid.tools.PerfConsumer
+echo "All args $@"
+
+JVM_ARGS="$1"
+PROGRAM_ARGS="$2"
+
+echo "JVM ARGS : $JAVA_MEM $JVM_ARGS"
+echo "PROGRAM ARGS : $PROGRAM_ARGS"
+
+$JAVA -cp $CLASSPATH $LOG_CONFIG $JAVA_MEM $JVM_ARGS org.apache.qpid.tools.PerfConsumer $PROGRAM_ARGS
 
-- 
cgit v1.2.1