Author: robbie
Date: Wed Nov 30 16:10:52 2011
New Revision: 1208480
URL: http://svn.apache.org/viewvc?rev=1208480&view=rev
Log:
NO-JIRA: update scripts to reference current deps etc
Modified:
qpid/trunk/qpid/java/bdbstore/bin/backup.sh
qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh
qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh
qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh
qpid/trunk/qpid/java/broker/bin/msTool.sh
Modified: qpid/trunk/qpid/java/bdbstore/bin/backup.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/bin/backup.sh?rev=1208480&r1=1208479&r2=1208480&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/backup.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/backup.sh Wed Nov 30 16:10:52 2011
@@ -33,7 +33,7 @@ if [ -z "$QPID_HOME" ]; then
fi
VERSION=0.15
-LIBS=$QPID_HOME/lib/je-4.0.103.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
+LIBS=$QPID_HOME/lib/opt/je-4.0.117.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
echo "Starting Hot Backup Script"
Modified: qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh?rev=1208480&r1=1208479&r2=1208480&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/storeUpgrade.sh Wed Nov 30 16:10:52 2011
@@ -32,12 +32,8 @@ if [ -z "$QPID_HOME" ]; then
export PATH=${PATH}:${QPID_HOME}/bin
fi
-if [ -z "$BDB_HOME" ]; then
- export BDB_HOME=$(dirname $(dirname $(readlink -f $0)))
-fi
-
VERSION=0.15
-LIBS=$BDB_HOME/lib/je-4.0.103.jar:$BDB_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
+LIBS=$QPID_HOME/lib/opt/je-4.0.117.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
java -Xms256m -Dlog4j.configuration=BDBStoreUpgrade.log4j.xml -Xmx256m
-Damqj.logging.level=warn ${JAVA_OPTS} -cp $LIBS
org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade ${ARGS}
Modified: qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh?rev=1208480&r1=1208479&r2=1208480&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh Wed Nov 30
16:10:52 2011
@@ -32,10 +32,10 @@ for arg in "$@"; do
fi
done
-VERSION=0.5
+VERSION=0.15
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.4.0.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.6.1.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar
# Set other variables used by the qpid-run script before calling
export JAVA=java JAVA_MEM=-Xmx256m QPID_CLASSPATH=$QPID_LIBS
Modified: qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh?rev=1208480&r1=1208479&r2=1208480&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/etc/scripts/bdbtest.sh Wed Nov 30 16:10:52
2011
@@ -32,10 +32,10 @@ for arg in "$@"; do
fi
done
-VERSION=0.5
+VERSION=0.15
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.4.0.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.6.1.jar
# Set other variables used by the qpid-run script before calling
export JAVA=java JAVA_MEM=-Xmx256m QPID_CLASSPATH=$QPID_LIBS
Modified: qpid/trunk/qpid/java/broker/bin/msTool.sh
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/msTool.sh?rev=1208480&r1=1208479&r2=1208480&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/msTool.sh (original)
+++ qpid/trunk/qpid/java/broker/bin/msTool.sh Wed Nov 30 16:10:52 2011
@@ -49,7 +49,7 @@ if $cygwin; then
fi
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_TOOLS/lib/qpid-all.jar
+QPID_LIBS="$QPID_TOOLS/lib/qpid-all.jar:$QPID_TOOLS/lib/opt/*"
# Set other variables used by the qpid-run script before calling
export JAVA=java \
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
