You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2013/09/24 01:54:07 UTC
svn commit: r1525752 - in /qpid/trunk/qpid/java: bdbstore/bin/backup.sh
broker/bin/qpid-passwd broker/bin/qpid-server broker/bin/qpid-server.bat
common/bin/qpid-jaddr
Author: robbie
Date: Mon Sep 23 23:54:06 2013
New Revision: 1525752
URL: http://svn.apache.org/r1525752
Log:
QPID-5164: remove use of qpid-all.jar from scripts, use classpath wildcard expansion to pick up .jar files in the dir instead
Modified:
qpid/trunk/qpid/java/bdbstore/bin/backup.sh
qpid/trunk/qpid/java/broker/bin/qpid-passwd
qpid/trunk/qpid/java/broker/bin/qpid-server
qpid/trunk/qpid/java/broker/bin/qpid-server.bat
qpid/trunk/qpid/java/common/bin/qpid-jaddr
Modified: qpid/trunk/qpid/java/bdbstore/bin/backup.sh
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/bin/backup.sh?rev=1525752&r1=1525751&r2=1525752&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/bin/backup.sh (original)
+++ qpid/trunk/qpid/java/bdbstore/bin/backup.sh Mon Sep 23 23:54:06 2013
@@ -35,7 +35,7 @@ if [ -z "${QPID_HOME}" ]; then
fi
# BDB's je JAR expected to be found in lib/opt
-LIBS="${QPID_HOME}/lib/opt/*:${QPID_HOME}/lib/qpid-all.jar"
+LIBS="${QPID_HOME}/lib/*:${QPID_HOME}/lib/plugins/*:${QPID_HOME}/lib/opt/*"
echo "Starting Hot Backup Script"
java -Dlog4j.configuration=backup-log4j.xml ${JAVA_OPTS} -cp "${LIBS}" org.apache.qpid.server.store.berkeleydb.BDBBackup "${ARGS[@]}"
Modified: qpid/trunk/qpid/java/broker/bin/qpid-passwd
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-passwd?rev=1525752&r1=1525751&r2=1525752&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid-passwd (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid-passwd Mon Sep 23 23:54:06 2013
@@ -23,8 +23,8 @@ if [ -z "$QPID_HOME" ]; then
export QPID_HOME=`cd "$WHEREAMI/../" && pwd`
fi
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
+# Set classpath to include jars from lib dir
+QPID_LIBS=$QPID_HOME/lib/*
# Set other variables used by the qpid-run script before calling
export JAVA=java \
Modified: qpid/trunk/qpid/java/broker/bin/qpid-server
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-server?rev=1525752&r1=1525751&r2=1525752&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid-server (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid-server Mon Sep 23 23:54:06 2013
@@ -33,8 +33,8 @@ if [ -z "$QPID_PNAME" ]; then
export QPID_PNAME=" -DPNAME=QPBRKR"
fi
-# Set classpath to include the qpid-all manifest jar, plus jars in lib/plugins and lib/opt
-QPID_LIBS="$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/plugins/*:$QPID_HOME/lib/opt/*"
+# Set classpath to include the jars in lib/, lib/plugins, and lib/opt
+QPID_LIBS="$QPID_HOME/lib/*:$QPID_HOME/lib/plugins/*:$QPID_HOME/lib/opt/*"
# Set other variables used by the qpid-run script before calling
export JAVA=java \
Modified: qpid/trunk/qpid/java/broker/bin/qpid-server.bat
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/bin/qpid-server.bat?rev=1525752&r1=1525751&r2=1525752&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/bin/qpid-server.bat (original)
+++ qpid/trunk/qpid/java/broker/bin/qpid-server.bat Mon Sep 23 23:54:06 2013
@@ -76,8 +76,8 @@ echo Using CLASSPATH: %CLASSPATH%
goto afterQpidClasspath
:noQpidClasspath
-echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\qpid-all.jar;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
-set CLASSPATH=%QPID_HOME%\lib\qpid-all.jar;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
+echo Warning: Qpid classpath not set. CLASSPATH set to %QPID_HOME%\lib\*;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
+set CLASSPATH=%QPID_HOME%\lib\*;%QPID_HOME%\lib\plugins\*;%QPID_HOME%\lib\opt\*
:afterQpidClasspath
REM start parsing -run arguments
Modified: qpid/trunk/qpid/java/common/bin/qpid-jaddr
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/bin/qpid-jaddr?rev=1525752&r1=1525751&r2=1525752&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/bin/qpid-jaddr (original)
+++ qpid/trunk/qpid/java/common/bin/qpid-jaddr Mon Sep 23 23:54:06 2013
@@ -23,8 +23,8 @@ if [ -z "$QPID_HOME" ]; then
export PATH=${PATH}:${QPID_HOME}/bin
fi
-# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar
+# Set classpath to include Qpid jars
+QPID_LIBS="$QPID_HOME/lib/*"
# Set other variables used by the qpid-run script before calling
export JAVA=java \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org