You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2009/09/15 10:13:22 UTC
svn commit: r815206 - in /qpid/trunk/qpid/java: broker/bin/qpid.stop
common/bin/qpid-run
systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Author: ritchiem
Date: Tue Sep 15 08:13:21 2009
New Revision: 815206
URL: http://svn.apache.org/viewvc?rev=815206&view=rev
Log:
Reveted changes to QPID-2099, QPID-2100. The value of PNAME must not be changed.
Modified:
qpid/trunk/qpid/java/broker/bin/qpid.stop
qpid/trunk/qpid/java/common/bin/qpid-run
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified: qpid/trunk/qpid/java/broker/bin/qpid.stop
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid.stop?rev=815206&r1=815205&r2=815206&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid.stop (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid.stop Tue Sep 15 08:13:21 2009
@@ -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
#
Modified: qpid/trunk/qpid/java/common/bin/qpid-run
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/bin/qpid-run?rev=815206&r1=815205&r2=815206&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/bin/qpid-run (original)
+++ qpid/trunk/qpid/java/common/bin/qpid-run Tue Sep 15 08:13:21 2009
@@ -59,7 +59,7 @@
#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 @@
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
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=815206&r1=815205&r2=815206&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Tue Sep 15 08:13:21 2009
@@ -447,7 +447,8 @@
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
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org