Author: rhs
Date: Wed Jul 30 04:49:58 2008
New Revision: 680987
URL: http://svn.apache.org/viewvc?rev=680987&view=rev
Log:
added defaulting of QPID_HOME
Modified:
incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd
incubator/qpid/trunk/qpid/java/broker/bin/qpid-server
incubator/qpid/trunk/qpid/java/common/bin/qpid-run
incubator/qpid/trunk/qpid/java/java.testprofile
Modified: incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd?rev=680987&r1=680986&r2=680987&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-passwd Wed Jul 30 04:49:58
2008
@@ -18,6 +18,11 @@
# under the License.
#
+if [ -z "$QPID_HOME" ]; then
+ export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+ 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-incubating.jar
Modified: incubator/qpid/trunk/qpid/java/broker/bin/qpid-server
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/bin/qpid-server?rev=680987&r1=680986&r2=680987&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/bin/qpid-server (original)
+++ incubator/qpid/trunk/qpid/java/broker/bin/qpid-server Wed Jul 30 04:49:58
2008
@@ -18,6 +18,11 @@
# under the License.
#
+if [ -z "$QPID_HOME" ]; then
+ export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+ 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-incubating.jar:$QPID_HOME/lib/bdbstore-launch.jar
Modified: incubator/qpid/trunk/qpid/java/common/bin/qpid-run
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/bin/qpid-run?rev=680987&r1=680986&r2=680987&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/bin/qpid-run (original)
+++ incubator/qpid/trunk/qpid/java/common/bin/qpid-run Wed Jul 30 04:49:58 2008
@@ -42,7 +42,8 @@
fi
if [ -z "$QPID_HOME" ]; then
- die "QPID_HOME must be set"
+ export QPID_HOME=$(dirname $(dirname $(readlink -f $0)))
+ export PATH=${PATH}:${QPID_HOME}/bin
fi
if [ -z "$QPID_WORK" ]; then
Modified: incubator/qpid/trunk/qpid/java/java.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/java.testprofile?rev=680987&r1=680986&r2=680987&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/java.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/java.testprofile Wed Jul 30 04:49:58 2008
@@ -1,4 +1,4 @@
-broker=build/bin/qpid-server
+broker=${project.root}/build/bin/qpid-server
broker.clean=${project.root}/clean-dir ${build.data}
broker.ready=Qpid Broker Ready
