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.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@533077 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 13 insertions, 25 deletions

diff --git a/java/broker/bin/bdbbackup b/java/broker/bin/bdbbackup
deleted file mode 100644
index 34743cd873..0000000000
--- a/java/broker/bin/bdbbackup
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-. qpid-run org.apache.qpid.server.store.berkeleydb.BDBBackup "$@"
diff --git a/java/broker/bin/passwd b/java/broker/bin/qpid-passwd
index c1bb05c082..6e64af6e70 100644
--- a/java/broker/bin/passwd
+++ b/java/broker/bin/qpid-passwd
@@ -18,4 +18,13 @@
 # under the License.

 #

 

+# Set classpath to include Qpid jar with all required jars in manifest

+QPID_LIBS=$QPID_HOME/lib/qpid-incubating.jar

+

+# Set other variables used by the qpid-run script before calling

+export JAVA=java \

+       JAVA_VM=-server \

+       JAVA_MEM=-Xmx1024m \

+       QPID_CLASSPATH=$QPID_LIBS

+

 . qpid-run org.apache.qpid.server.security.Passwd "$@"

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