Author: ritchiem
Date: Fri Apr 27 05:29:52 2007
New Revision: 533077
URL: http://svn.apache.org/viewvc?view=rev&rev=533077
Log:
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.
Added:
incubator/qpid/branches/M2/java/broker/bin/qpid-passwd
- copied, changed from r532729,
incubator/qpid/branches/M2/java/broker/bin/passwd
Removed:
incubator/qpid/branches/M2/java/broker/bin/bdbbackup
incubator/qpid/branches/M2/java/broker/bin/passwd
Modified:
incubator/qpid/branches/M2/java/common/bin/qpid-run
Copied: incubator/qpid/branches/M2/java/broker/bin/qpid-passwd (from r532729,
incubator/qpid/branches/M2/java/broker/bin/passwd)
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/bin/qpid-passwd?view=diff&rev=533077&p1=incubator/qpid/branches/M2/java/broker/bin/passwd&r1=532729&p2=incubator/qpid/branches/M2/java/broker/bin/qpid-passwd&r2=533077
==============================================================================
--- incubator/qpid/branches/M2/java/broker/bin/passwd (original)
+++ incubator/qpid/branches/M2/java/broker/bin/qpid-passwd Fri Apr 27 05:29:52
2007
@@ -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 "$@"
Modified: incubator/qpid/branches/M2/java/common/bin/qpid-run
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/common/bin/qpid-run?view=diff&rev=533077&r1=533076&r2=533077
==============================================================================
--- incubator/qpid/branches/M2/java/common/bin/qpid-run (original)
+++ incubator/qpid/branches/M2/java/common/bin/qpid-run Fri Apr 27 05:29:52 2007
@@ -70,7 +70,7 @@
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 @@
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 @@
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 @@
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
