Author: agazzarini
Date: Tue May 12 13:30:58 2009
New Revision: 773887
URL: http://svn.apache.org/viewvc?rev=773887&view=rev
Log:
QPID-1848 : merge from trunk 2 0.5release branch
Modified:
qpid/branches/0.5-release/qpid/java/management/client/bin/qman-jmx.sh
(contents, props changed)
Modified: qpid/branches/0.5-release/qpid/java/management/client/bin/qman-jmx.sh
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/java/management/client/bin/qman-jmx.sh?rev=773887&r1=773886&r2=773887&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/java/management/client/bin/qman-jmx.sh
(original)
+++ qpid/branches/0.5-release/qpid/java/management/client/bin/qman-jmx.sh Tue
May 12 13:30:58 2009
@@ -42,28 +42,16 @@
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 ""
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
Propchange:
qpid/branches/0.5-release/qpid/java/management/client/bin/qman-jmx.sh
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May 12 13:30:58 2009
@@ -0,0 +1 @@
+/qpid/trunk/qpid/java/management/client/bin/qman-jmx.sh:755260-773884
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
