diff options
| -rwxr-xr-x | qpid/java/broker/bin/qpid.stop | 16 | ||||
| -rwxr-xr-x | qpid/java/common/bin/qpid-run | 4 | ||||
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java | 3 |
3 files changed, 8 insertions, 15 deletions
diff --git a/qpid/java/broker/bin/qpid.stop b/qpid/java/broker/bin/qpid.stop index 2a5caac8d4..316f8dff46 100755 --- a/qpid/java/broker/bin/qpid.stop +++ b/qpid/java/broker/bin/qpid.stop @@ -25,20 +25,12 @@ MAX_ATTEMPTS=2 SLEEP_DELAY=1 -DEFAULT_SEARCH="\-DPNAME=\"" +DEFAULT_SEARCH="PNAME=QPBRKR" -# -# Use QPID_PNAME to set search criteria. -# - If not set default back to attempting QPID_STOP_SEARCH -# -if [ -z "$QPID_PNAME" ]; then - if [ -z "$QPID_STOP_SEARCH" ]; then - SEARCH=$DEFAULT_SEARCH; - else - SEARCH=$DEFAULT_SEARCH$QPID_STOP_SEARCH; - fi +if [ -z "$QPID_STOP_SEARCH" ]; then + SEARCH=$DEFAULT_SEARCH; else - SEARCH=$DEFAULT_SEARCH$QPID_PNAME; + SEARCH=$QPID_STOP_SEARCH; fi # diff --git a/qpid/java/common/bin/qpid-run b/qpid/java/common/bin/qpid-run index e171f91297..0b5070d937 100755 --- a/qpid/java/common/bin/qpid-run +++ b/qpid/java/common/bin/qpid-run @@ -59,7 +59,7 @@ fi #Set to help us get round the manifold problems of ps/pgrep on various #platforms which gather up to prevent qpid_stop from working ..... if [ -z "$QPID_PNAME" ]; then - export QPID_PNAME="QPBRKR" + export QPID_PNAME=" -DPNAME=QPBRKR" fi if [ -z "$QPID_HOME" ]; then @@ -259,6 +259,6 @@ if $cygwin; then JAVA=$(cygpath -u $JAVA) fi -COMMAND=($JAVA $JAVA_VM -DPNAME=\"$QPID_PNAME\" $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") +COMMAND=($JAVA $JAVA_VM $QPID_PNAME $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") DISPATCH diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 7087473369..0acade8e4f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -447,7 +447,8 @@ public class QpidTestCase extends TestCase env.put("PATH", env.get("PATH").concat(File.pathSeparator + qpidHome + "/bin")); //Add the test name to the broker run. - env.put("QPID_PNAME", _testName ); + // DON'T change PNAME, qpid.stop needs this value. + env.put("QPID_PNAME", "-DPNAME=QPBRKR -DTNAME=\"" + _testName + "\""); env.put("QPID_WORK", System.getProperty("QPID_WORK")); // Add all the environment settings the test requested |