diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2008-07-30 11:49:58 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2008-07-30 11:49:58 +0000 |
| commit | 0519f7d20ede77b731d34393b27696374433195d (patch) | |
| tree | 83a4491aa92c8c02e4735744b4ad156c2b0a91ef /java | |
| parent | c5c7b36f327ed0acfa9eb7f152d2a1d6b1c80073 (diff) | |
| download | qpid-python-0519f7d20ede77b731d34393b27696374433195d.tar.gz | |
added defaulting of QPID_HOME
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@680987 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/broker/bin/qpid-passwd | 5 | ||||
| -rw-r--r-- | java/broker/bin/qpid-server | 5 | ||||
| -rwxr-xr-x | java/common/bin/qpid-run | 3 | ||||
| -rw-r--r-- | java/java.testprofile | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/java/broker/bin/qpid-passwd b/java/broker/bin/qpid-passwd index f046252522..f425eed72b 100644 --- a/java/broker/bin/qpid-passwd +++ b/java/broker/bin/qpid-passwd @@ -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
diff --git a/java/broker/bin/qpid-server b/java/broker/bin/qpid-server index d0198f8dc9..30c54f18cd 100644 --- a/java/broker/bin/qpid-server +++ b/java/broker/bin/qpid-server @@ -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 diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run index c9e37b21a1..e9557f75cd 100755 --- a/java/common/bin/qpid-run +++ b/java/common/bin/qpid-run @@ -42,7 +42,8 @@ if [ -z $AMQJ_LOGGING_LEVEL ]; then 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 diff --git a/java/java.testprofile b/java/java.testprofile index 53ec4d340d..cef0a10661 100644 --- a/java/java.testprofile +++ b/java/java.testprofile @@ -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 |