diff options
| author | Andrea Gazzarini <agazzarini@apache.org> | 2009-01-15 10:56:12 +0000 |
|---|---|---|
| committer | Andrea Gazzarini <agazzarini@apache.org> | 2009-01-15 10:56:12 +0000 |
| commit | 87182a225b12ffc30811498263a75e4594da91f7 (patch) | |
| tree | 2eb92bcf41cd9a5034842597021b2c77c5e875dc /qpid/java/management/client/bin | |
| parent | ac945984c82b808a961c92d31760795f50c2b3c3 (diff) | |
| download | qpid-python-87182a225b12ffc30811498263a75e4594da91f7.tar.gz | |
QPID-1574 : Startup scripts & deployment descriptor fixes
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@734664 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/management/client/bin')
| -rw-r--r-- | qpid/java/management/client/bin/qman-wsdm-start.cmd | 2 | ||||
| -rw-r--r-- | qpid/java/management/client/bin/qman-wsdm-start.sh | 12 | ||||
| -rw-r--r-- | qpid/java/management/client/bin/qman-wsdm-stop.sh | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/qpid/java/management/client/bin/qman-wsdm-start.cmd b/qpid/java/management/client/bin/qman-wsdm-start.cmd index 4b2547b817..4e80177521 100644 --- a/qpid/java/management/client/bin/qman-wsdm-start.cmd +++ b/qpid/java/management/client/bin/qman-wsdm-start.cmd @@ -86,4 +86,4 @@ echo. echo ===============================================================================
echo.
-%JAVA% -Djetty.home=%QMAN_HOME% -Dqman.host=%QMAN_WSDM_ADAPTER_HOST% -Dqman.port=%QMAN_WSDM_ADAPTER_PORT% -DSTOP.PORT=%ADMIN_PORT% -DSTOP.KEY=%ADMIN_KEY% -Dqman-config=%QMAN_CONFIG_FILE% org.mortbay.start.Main %JETTY_CONFIG_FILE%
\ No newline at end of file +%JAVA% -cp %CLASSPATH% -DQMAN_HOME=%QMAN_HOME% -Djetty.home=%QMAN_HOME% -Dqman.host=%QMAN_WSDM_ADAPTER_HOST% -Dqman.port=%QMAN_WSDM_ADAPTER_PORT% -DSTOP.PORT=%ADMIN_PORT% -DSTOP.KEY=%ADMIN_KEY% -Dqman-config=%QMAN_CONFIG_FILE% org.mortbay.start.Main %JETTY_CONFIG_FILE%
\ No newline at end of file diff --git a/qpid/java/management/client/bin/qman-wsdm-start.sh b/qpid/java/management/client/bin/qman-wsdm-start.sh index 5a718cb9fd..239d1bf2f0 100644 --- a/qpid/java/management/client/bin/qman-wsdm-start.sh +++ b/qpid/java/management/client/bin/qman-wsdm-start.sh @@ -33,7 +33,7 @@ # ************************************************************************** JAVA=$JAVA_HOME/bin/java -JAVA_OPTS=-Xms128m -Xmx512m +JAVA_OPTS="-Xms128m -Xmx512m" if [ "$JAVA_HOME" = "" ] ; then echo "JAVA_HOME is not set. Unexpected results may occur." @@ -47,7 +47,7 @@ if [ "$QMAN_WSDM_ADAPTER_PORT" = "" ] ; then QMAN_WSDM_ADAPTER_PORT=8080 fi if [ "$QMAN_WSDM_ADAPTER_HOST" = "" ] ; then - QMAN_WSDM_ADAPTER_PORT=$HOSTNAME + QMAN_WSDM_ADAPTER_HOST=$HOSTNAME fi if [ "$QMAN_CONFIG_FILE" = "" ] ; then QMAN_CONFIG_FILE=$QMAN_HOME/etc/qman-config.xml @@ -58,7 +58,7 @@ ADMIN_KEY=gazzax QMAN_LIBS=$QMAN_HOME/lib JETTY_CONFIG_FILE=$QMAN_HOME/etc/jetty.xml -CLASSPATH=$QMAN_HOME/etc:$QMAN_LIBS/start.jar:$QMAN_LIBS/jetty-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/geronimo-servlet_2.5_spec-1.2.jar:$QMAN_LIBS/slf4j-api-1.4.0.jar:$QMAN_LIBS/slf4j-log4j12-1.4.0.jar:$QMAN_LIBS/log4j-1.2.12.jar +QMAN_CLASSPATH=$QMAN_HOME/etc:$QMAN_LIBS/start.jar:$QMAN_LIBS/jetty-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/jetty-util-6.1.14.jar:$QMAN_LIBS/geronimo-servlet_2.5_spec-1.2.jar:$QMAN_LIBS/slf4j-api-1.4.0.jar:$QMAN_LIBS/slf4j-log4j12-1.4.0.jar:$QMAN_LIBS/log4j-1.2.12.jar echo "===============================================================================" echo"" @@ -77,11 +77,13 @@ echo "Web Server Configuration File : $JETTY_CONFIG_FILE" echo"" echo "Web Server HTTP port : $QMAN_WSDM_ADAPTER_PORT" echo"" +echo "Web Server HTTP host : $QMAN_WSDM_ADAPTER_HOST" +echo"" echo "Web Server Admin port : $ADMIN_PORT" echo"" -echo "Bootstrap classpath : $CLASSPATH" +echo "Bootstrap classpath : $QMAN_CLASSPATH" echo"" echo "===============================================================================" echo"" -"$JAVA" $JAVA_OPTS -Djetty.home=$QMAN_HOME -Dqman.host=$QMAN_WSDM_ADAPTER_HOST -Dqman.port=$QMAN_WSDM_ADAPTER_HOST -DSTOP.PORT=$ADMIN_PORT -DSTOP.KEY=$ADMIN_KEY -Dqman-config=$QMAN_CONFIG_FILE org.mortbay.start.Main $JETTY_CONFIG_FILE
\ No newline at end of file +"$JAVA" $JAVA_OPTS -cp $QMAN_CLASSPATH -DQMAN_HOME=$QMAN_HOME -Djetty.home=$QMAN_HOME -Dqman.host=$QMAN_WSDM_ADAPTER_HOST -Dqman.port=$QMAN_WSDM_ADAPTER_PORT -DSTOP.PORT=$ADMIN_PORT -DSTOP.KEY=$ADMIN_KEY -Dqman-config=$QMAN_CONFIG_FILE org.mortbay.start.Main $JETTY_CONFIG_FILE
\ No newline at end of file diff --git a/qpid/java/management/client/bin/qman-wsdm-stop.sh b/qpid/java/management/client/bin/qman-wsdm-stop.sh index 1b76f36eea..0de9a995ef 100644 --- a/qpid/java/management/client/bin/qman-wsdm-stop.sh +++ b/qpid/java/management/client/bin/qman-wsdm-stop.sh @@ -30,8 +30,8 @@ if [ "$QMAN_HOME" = "" ] ; then QMAN_HOME=.. fi -SET ADMIN_PORT=8079 -SET ADMIN_KEY=gazzax +ADMIN_PORT=8079 +ADMIN_KEY=gazzax "$JAVA" -DSTOP.PORT=$ADMIN_PORT -DSTOP.KEY=$ADMIN_KEY -jar $QMAN_HOME/lib/start.jar --stop |