summaryrefslogtreecommitdiff
path: root/qpid/java/perftests
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/perftests')
-rwxr-xr-xqpid/java/perftests/bin/topicListener.sh5
-rwxr-xr-xqpid/java/perftests/bin/topicPublisher.sh5
-rw-r--r--qpid/java/perftests/generate-scripts2
3 files changed, 5 insertions, 7 deletions
diff --git a/qpid/java/perftests/bin/topicListener.sh b/qpid/java/perftests/bin/topicListener.sh
index a728592cd7..3a925910ad 100755
--- a/qpid/java/perftests/bin/topicListener.sh
+++ b/qpid/java/perftests/bin/topicListener.sh
@@ -20,14 +20,13 @@
# XXX -Xmx512m -Xms512m -XX:NewSize=150m
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
-TEST_JAR=$QPID_HOME/../../../../perftests/target/qpid-perftests-1.0-incubating-M2-SNAPSHOT.jar
+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="-Xmx128m -Dlog4j.configuration=$HOME/log4j.properties" \
JAVA_GC="-XX:-UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
- QPID_CLASSPATH=$QPID_LIBS:$TEST_JAR
+ QPID_CLASSPATH=$QPID_LIBS
. qpid-run -Damqj.logging.level="INFO" org.apache.qpid.oldtopic.Listener $*
diff --git a/qpid/java/perftests/bin/topicPublisher.sh b/qpid/java/perftests/bin/topicPublisher.sh
index f9b6bc19fe..e4e9981a75 100755
--- a/qpid/java/perftests/bin/topicPublisher.sh
+++ b/qpid/java/perftests/bin/topicPublisher.sh
@@ -19,14 +19,13 @@
#
# XXX -Xmx512m -Xms512m -XX:NewSize=150m
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
-TEST_JAR=$QPID_HOME/../../../../perftests/target/qpid-perftests-1.0-incubating-M2-SNAPSHOT.jar
+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=-Xmx128m \
JAVA_GC="-XX:-UseConcMarkSweepGC -XX:+HeapDumpOnOutOfMemoryError" \
- QPID_CLASSPATH=$QPID_LIBS:$TEST_JAR
+ QPID_CLASSPATH=$QPID_LIBS
. qpid-run -Damqj.logging.level="INFO" org.apache.qpid.oldtopic.Publisher $*
diff --git a/qpid/java/perftests/generate-scripts b/qpid/java/perftests/generate-scripts
index a91094253c..3d12cc13c3 100644
--- a/qpid/java/perftests/generate-scripts
+++ b/qpid/java/perftests/generate-scripts
@@ -55,7 +55,7 @@ for arg in "$@"; do
done
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
# Set other variables used by the qpid-run script before calling
export JAVA=java \