You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2012/02/15 16:29:22 UTC
svn commit: r1244535 - in /qpid/trunk/qpid/java: broker/bin/qpid-passwd
common/bin/qpid-run
systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
Author: kwall
Date: Wed Feb 15 15:29:22 2012
New Revision: 1244535
URL: http://svn.apache.org/viewvc?rev=1244535&view=rev
Log:
QPID-3840: corrected qpid-passwd and qpid-run to handle paths with spaces in them. Modified unit test to capture stderr to aid diagnosis of failures.
Applied patch from Andrew MacBean <an...@gmail.com> and Philip Harvey <ph...@philharveyonline.com>
Modified:
qpid/trunk/qpid/java/broker/bin/qpid-passwd
qpid/trunk/qpid/java/common/bin/qpid-run
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
Modified: qpid/trunk/qpid/java/broker/bin/qpid-passwd
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-passwd?rev=1244535&r1=1244534&r2=1244535&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid-passwd (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid-passwd Wed Feb 15 15:29:22 2012
@@ -18,9 +18,9 @@
# under the License.
#
-WHEREAMI=`dirname $0`
if [ -z "$QPID_HOME" ]; then
- export QPID_HOME=`cd $WHEREAMI/../ && pwd`
+ WHEREAMI=`dirname "$0"`
+ export QPID_HOME=`cd "$WHEREAMI/../" && pwd`
fi
# Set classpath to include Qpid jar with all required jars in manifest
@@ -32,4 +32,4 @@ export JAVA=java \
JAVA_MEM=-Xmx1024m \
QPID_CLASSPATH=$QPID_LIBS
-. ${QPID_HOME}/bin/qpid-run org.apache.qpid.tools.security.Passwd "$@"
+. "${QPID_HOME}/bin/qpid-run" org.apache.qpid.tools.security.Passwd "$@"
Modified: qpid/trunk/qpid/java/common/bin/qpid-run
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/bin/qpid-run?rev=1244535&r1=1244534&r2=1244535&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/bin/qpid-run (original)
+++ qpid/trunk/qpid/java/common/bin/qpid-run Wed Feb 15 15:29:22 2012
@@ -110,7 +110,7 @@ fi
log $INFO System Properties set to ${SYSTEM_PROPS[@]}
log $INFO QPID_OPTS set to $QPID_OPTS
-program=$(basename $0)
+program=$(basename "$0")
sourced=${BASH_SOURCE[0]}
if [[ -z ${sourced:-''} ]]; then
sourced=$(which qpid-run) || ${QPID_HOME}/bin/qpid-run
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java?rev=1244535&r1=1244534&r2=1244535&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/scripts/QpidPasswdTest.java Wed Feb 15 15:29:22 2012
@@ -23,9 +23,13 @@ import java.util.concurrent.TimeUnit;
import org.apache.qpid.test.utils.Piper;
import org.apache.qpid.test.utils.QpidTestCase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class QpidPasswdTest extends QpidTestCase
{
+ private static final Logger LOGGER = LoggerFactory.getLogger(QpidPasswdTest.class);
+
private static final String PASSWD_SCRIPT = "qpid-passwd";
private static final String EXPECTED_OUTPUT = "user1:rL0Y20zC+Fzt72VPzMSk2A==";
@@ -39,15 +43,19 @@ public class QpidPasswdTest extends Qpid
+ "bin" + File.separatorChar
+ PASSWD_SCRIPT;
+ LOGGER.info("About to run script: " + scriptPath);
+
ProcessBuilder pb = new ProcessBuilder(scriptPath, "user1", "foo");
+ pb.redirectErrorStream(true);
process = pb.start();
Piper piper = new Piper(process.getInputStream(), System.out, EXPECTED_OUTPUT, EXPECTED_OUTPUT);
piper.start();
boolean finishedSuccessfully = piper.await(2, TimeUnit.SECONDS);
- assertTrue("Script should have completed with expected output " + EXPECTED_OUTPUT, finishedSuccessfully);
-
+ assertTrue(
+ "Script should have completed with expected output " + EXPECTED_OUTPUT + ". Check standard output for actual output.",
+ finishedSuccessfully);
process.waitFor();
piper.join();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org