From ab65fed92a590905728b431699ee0584375706bb Mon Sep 17 00:00:00 2001
From: Marnie McCormack <marnie@apache.org>
Date: Thu, 12 Apr 2007 16:16:34 +0000
Subject: QPID-352 Changes

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@528005 13f79535-47bb-0310-9956-ffa450edef68
---
 java/common/bin/qpid-run | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'java')

diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run
index 6d7837c120..fe8fd0e9cc 100644
--- a/java/common/bin/qpid-run
+++ b/java/common/bin/qpid-run
@@ -106,15 +106,20 @@ usage() {
 export EXTERNAL_CLASSPATH=$CLASSPATH
 unset CLASSPATH
 
-conf=$QPID_HOME/etc/$program.conf
-if [ ! -e $conf ]; then
-  conf=$QPID_HOME/etc/$(basename ${sourced}).conf
+#Use QPID_CLASSPATH if set
+if [ -n "$QPID_CLASSPATH" ]; then
+    export CLASSPATH=$QPID_CLASSPATH
+    echo "Using QPID_CLASSPATH" $QPID_CLASSPATH
+else
+    echo "Warning: Qpid classpath not set. CLASSPATH must include qpid jars."
 fi
 
-if [ -r $conf ]; then
-  . $conf
+#Use QPID_JAVA_MEM if set
+if [ -n "$QPID_JAVA_MEM" ]; then
+    export JAVA_MEM=$QPID_JAVA_MEM
+    echo "Using QPID_JAVA_MEM setting" $QPID_JAVA_MEM
 else
-  die "unable to source $conf"
+    echo "Info: QPID_JAVA_MEM not set. Defaulting to JAVA_MEM" $JAVA_MEM
 fi
 
 declare -a RUN_ARGS JAVA_ARGS
-- 
cgit v1.2.1