diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2008-10-09 21:17:17 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2008-10-09 21:17:17 +0000 |
| commit | 88cd0e14d9c8b981da2424aec1f205acc37b2782 (patch) | |
| tree | fb88edd20f8ff93904c64ea8add60cd32e041caa /qpid/java/management/tools/qpid-cli/bin | |
| parent | 48ee75d4252bce8738395384b6f9daae4d251f34 (diff) | |
| download | qpid-python-88cd0e14d9c8b981da2424aec1f205acc37b2782.tar.gz | |
QPID-1342: fixed qpid-cli build and shell scripts; tests still don't run properly by default since the expect the java broker to be running
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@703262 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/management/tools/qpid-cli/bin')
| -rwxr-xr-x | qpid/java/management/tools/qpid-cli/bin/qpid-cli | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/qpid/java/management/tools/qpid-cli/bin/qpid-cli b/qpid/java/management/tools/qpid-cli/bin/qpid-cli index 4f0dbf6096..7f84472ebe 100755 --- a/qpid/java/management/tools/qpid-cli/bin/qpid-cli +++ b/qpid/java/management/tools/qpid-cli/bin/qpid-cli @@ -17,21 +17,19 @@ # specific language governing permissions and limitations # under the License. # -# set classpath to using jar files -for f in $QPID_HOME/lib/*.jar -do - CLASSPATH=$CLASSPATH:$f -done -export CLASSPATH +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 -export CLASSPATH=$CLASSPATH:$QPID_HOME/management/tools/qpid-cli/main/classes/ - - - - -java -classpath $CLASSPATH org.apache.qpid.CommandLineInterpreter $@ - - +# Set other variables used by the qpid-run script before calling +export JAVA=java \ + JAVA_VM=-server \ + JAVA_MEM=-Xmx1024m \ + QPID_CLASSPATH=$QPID_LIBS +. qpid-run org.apache.qpid.CommandLineInterpreter "$@" |