diff options
| author | Andrea Gazzarini <agazzarini@apache.org> | 2009-05-12 13:30:58 +0000 |
|---|---|---|
| committer | Andrea Gazzarini <agazzarini@apache.org> | 2009-05-12 13:30:58 +0000 |
| commit | 6a6d218cec22d142e7b90dfb894043d401c14f39 (patch) | |
| tree | 3026e3bc395e333a6dde2656854dc9612a8e52d8 | |
| parent | cb6e1360b1f43dbc3e74e3187934e38a8aa240f3 (diff) | |
| download | qpid-python-6a6d218cec22d142e7b90dfb894043d401c14f39.tar.gz | |
QPID-1848 : merge from trunk 2 0.5release branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@773887 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/management/client/bin/qman-jmx.sh | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/qpid/java/management/client/bin/qman-jmx.sh b/qpid/java/management/client/bin/qman-jmx.sh index 9058999bef..c10e42f282 100644 --- a/qpid/java/management/client/bin/qman-jmx.sh +++ b/qpid/java/management/client/bin/qman-jmx.sh @@ -42,28 +42,16 @@ if [ "$JAVA_HOME" = "" ] ; then fi if [ "$QMAN_HOME" = "" ] ; then + QMAN_HOME=.. +fi - if [ "$QPID_LIB_PATH" = "" ] ; then - QPID_LIB_PATH=/usr/share/java - fi - - if [ "$QMAN_CONFIG_FILE" = "" ] ; then - QMAN_CONFIG_FILE=/etc/qman-config.xml - QMAN_LOG4J=/etc/qman.log4j - fi -else - if [ "$QPID_LIB_PATH" = "" ] ; then - QPID_LIB_PATH=$QMAN_HOME/lib - fi - - if [ "$QMAN_CONFIG_FILE" = "" ] ; then - QMAN_CONFIG_FILE=$QMAN_HOME/etc/qman-config.xml - QMAN_LOG4J=$QMAN_HOME/etc/qman.log4j - fi +if [ "$QMAN_CONFIG_FILE" = "" ] ; then + QMAN_CONFIG_FILE=$QMAN_HOME/etc/qman-config.xml fi +QMAN_LIBS=$QMAN_HOME/lib QMAN_CLASSPATH=`find $QMAN_LIBS | tr '\n' ":"` -QMAN_CLASSPATH=$QMAN_LOG4J:$QMAN_CLASSPATH +QMAN_CLASSPATH=$QMAN_HOME/etc:$QMAN_CLASSPATH echo "===============================================================================" echo "" @@ -78,9 +66,9 @@ echo "Java Opts : $JAVA_OPTS" echo "" echo "Configuration file : $QMAN_CONFIG_FILE" echo "" -echo "Log4J file : $QMAN_LOG4J" +echo "Bootstrap classpath : $QMAN_CLASSPATH" echo "" echo "===============================================================================" echo "" -"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -Dcom.sun.management.jmxremote -Dlog4j.configuration=qman.log4j -Dqman-config=$QMAN_CONFIG_FILE org.apache.qpid.management.domain.services.QMan +"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -Dcom.sun.management.jmxremote -Dqman-config=$QMAN_CONFIG_FILE org.apache.qpid.management.domain.services.QMan
\ No newline at end of file |