diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-04-27 12:48:51 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-04-27 12:48:51 +0000 |
| commit | 1728d25e47815a3d12320d77f03b98909f55b715 (patch) | |
| tree | 49279d223c510b02398e5b4e24f19ff63054bb63 /java/common/bin | |
| parent | 90b39f5665f0159767d94c4fc3b466586ddec147 (diff) | |
| download | qpid-python-1728d25e47815a3d12320d77f03b98909f55b715.tar.gz | |
Merged revisions 533075-533079 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2
........
r533075 | ritchiem | 2007-04-27 13:27:19 +0100 (Fri, 27 Apr 2007) | 2 lines
QPID-473 Base64MD5PrincipalDatabase doesn't check password changes were applied to disk before storing in memory
Reversed the effects of the requested change if the changes cannot be persisted to disk
........
r533077 | ritchiem | 2007-04-27 13:29:52 +0100 (Fri, 27 Apr 2007) | 3 lines
Bin Updates: Qpid-Run removed new bash 3.x feature += replaced with option="${value1} ${value2}" constructs to support older bash 2.x
renamed passwd qpid-passwd and fixed classpath loading errors.
Moved bdbbackup script to live with the bdb module.
........
r533078 | ritchiem | 2007-04-27 13:30:07 +0100 (Fri, 27 Apr 2007) | 1 line
Updated PrincipalDatabase implementations to return empty strings rather than null. As this causes NPE on MC.
........
r533079 | ritchiem | 2007-04-27 13:31:03 +0100 (Fri, 27 Apr 2007) | 1 line
Updated MLT to have variables that define the BROKER and VHOST used and White space
........
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@533083 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/common/bin')
| -rw-r--r-- | java/common/bin/qpid-run | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run index fe8fd0e9cc..fc607529ee 100644 --- a/java/common/bin/qpid-run +++ b/java/common/bin/qpid-run @@ -70,7 +70,7 @@ if [ -n "$QPID_LOG_PREFIX" ]; then echo Using qpid logprefix property LOG_PREFIX=" -Dlogprefix=$QPID_LOG_PREFIX" fi - SYSTEM_PROPS+=$LOG_PREFIX + SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_PREFIX}" fi if [ -n "$QPID_LOG_SUFFIX" ]; then @@ -81,7 +81,7 @@ if [ -n "$QPID_LOG_SUFFIX" ]; then echo Using qpig logsuffix property LOG_SUFFIX=" -Dlogsuffix=$QPID_LOG_SUFFIX" fi - SYSTEM_PROPS+=$LOG_SUFFIX + SYSTEM_PROPS="${SYSTEM_PROPS} ${LOG_SUFFIX}" fi echo System Properties set to $SYSTEM_PROPS @@ -146,7 +146,7 @@ exclusive() { if [ -z "$PREVIOUS_ARGS" ]; then PREVIOUS_ARGS=$1 else - PREVIOUS_ARGS+=", $1" + PREVIOUS_ARGS="${PREVIOUS_ARGS}, $1" DISPATCH() { die -usage "you must choose one of: $PREVIOUS_ARGS" } @@ -168,7 +168,7 @@ for arg in "${RUN_ARGS[@]}"; do if [ -z "$JPDA_OPTS" ]; then JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT:-dt_socket},address=${JPDA_ADDRESS:-8000},server=y,suspend=n" fi - QPID_OPTS+=" ${JPDA_OPTS}" + QPID_OPTS="${QPID_OPTS} ${JPDA_OPTS}" ;; -run:external-classpath=*) #USAGE: controls how the CLASSPATH environment variable is used by |