QPID-1574 : Startup scripts & deployment descriptor fixes

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@734664 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 154 insertions, 172 deletions

diff --git a/java/management/client/bin/qman-wsdm-start.cmd b/java/management/client/bin/qman-wsdm-start.cmd
index 4b2547b817..4e80177521 100644
--- a/java/management/client/bin/qman-wsdm-start.cmd
+++ b/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/java/management/client/bin/qman-wsdm-start.sh b/java/management/client/bin/qman-wsdm-start.sh
index 5a718cb9fd..239d1bf2f0 100644
--- a/java/management/client/bin/qman-wsdm-start.sh
+++ b/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/java/management/client/bin/qman-wsdm-stop.sh b/java/management/client/bin/qman-wsdm-stop.sh
index 1b76f36eea..0de9a995ef 100644
--- a/java/management/client/bin/qman-wsdm-stop.sh
+++ b/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
 
diff --git a/java/management/client/etc/jetty.xml b/java/management/client/etc/jetty.xml
index e7033e3e86..11153d0d6f 100644
--- a/java/management/client/etc/jetty.xml
+++ b/java/management/client/etc/jetty.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>

-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">

-<Configure id="Server" class="org.mortbay.jetty.Server">

-	<Set name="StopAtShutdown">true</Set>

-	<Set name="Connectors">

-		<Array type="org.mortbay.jetty.Connector">

-			<Item>

-				<New

-					class="org.mortbay.jetty.nio.SelectChannelConnector">

-					<Set name="port">

-						<SystemProperty name="qman.port" default="8080" />

-					</Set>

-					<Set name="host">

-						<SystemProperty name="qman.host" default="localhost" />

-					</Set>

-				</New>

-			</Item>

-		</Array>

-	</Set>

-	<Set name="handler">

-		<New class="org.mortbay.jetty.webapp.WebAppContext">

-			<Set name="contextPath">/qman</Set>

-			<Set name="war"><SystemProperty name="jetty.home" default=".." />/lib/qman.war</Set>

-		</New>

-	</Set>

+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure id="Server" class="org.mortbay.jetty.Server">
+	<Set name="StopAtShutdown">true</Set>
+	<Set name="Connectors">
+		<Array type="org.mortbay.jetty.Connector">
+			<Item>
+				<New
+					class="org.mortbay.jetty.nio.SelectChannelConnector">
+					<Set name="port">
+						<SystemProperty name="qman.port" default="8080" />
+					</Set>
+					<Set name="host">
+						<SystemProperty name="qman.host" default="localhost" />
+					</Set>
+				</New>
+			</Item>
+		</Array>
+	</Set>
+	<Set name="handler">
+		<New class="org.mortbay.jetty.webapp.WebAppContext">
+			<Set name="contextPath">/qman</Set>
+			<Set name="war"><SystemProperty name="QMAN_HOME" default=".." />/lib/qman.war</Set>
+		</New>
+	</Set>
 </Configure>
\ No newline at end of file
diff --git a/java/management/client/etc/log4j.xml b/java/management/client/etc/log4j.xml
index 09d73efe6d..d40d798aee 100644
--- a/java/management/client/etc/log4j.xml
+++ b/java/management/client/etc/log4j.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">

-

-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">

-

-	<!-- QMan Appender-->

-	<appender name="QMAN_LOG"

-		class="org.apache.log4j.DailyRollingFileAppender">

-		<param name="File" value="../log/qman.log" />

-		<param name="Append" value="true" />

-		<param name="DatePattern" value="'.'yyyy-MM-dd" />

-		<layout class="org.apache.log4j.PatternLayout">

-			<param name="ConversionPattern" value="%d %-5p [%c{1}] %m%n" />

-		</layout>

-	</appender>

-

-	<!-- XML messages appender -->

-	<appender name="MESSAGES_LOG"

-		class="org.apache.log4j.DailyRollingFileAppender">

-<!--		<param name="File" value="../log/messages.log" /> -->

-		<param name="File" value="../log/messages.log"/>

-		<param name="Append" value="true" />

-		<param name="DatePattern" value="'.'yyyy-MM-dd" />

-		<layout class="org.apache.log4j.PatternLayout">

-			<param name="ConversionPattern" value="%d%n %m%n" />

-		</layout>

-	</appender>

-

-	<!-- Web Server Appender-->

-	<appender name="SERVER_LOG"

-		class="org.apache.log4j.DailyRollingFileAppender">

-		<param name="File" value="../log/server.log" />

-		<param name="Append" value="true" />

-		<param name="DatePattern" value="'.'yyyy-MM-dd" />

-		<layout class="org.apache.log4j.PatternLayout">

-			<param name="ConversionPattern" value="%d %-5p [%c{1}] %m%n" />

-		</layout>

-	</appender>

-

-	<!-- Write to stdout -->

-	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">

-		<param name="Target" value="System.out" />

-		<param name="Threshold" value="DEBUG" />

-		<layout class="org.apache.log4j.PatternLayout">

-			<param name="ConversionPattern"

-				value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />

-		</layout>

-	</appender>

-

-	<!-- Category for QMan module -->

-	<category name="org.apache.qpid.management">

-		<priority value="INFO" />

-		<appender-ref ref="QMAN_LOG" />

-	</category>

-

-	<!-- Category for Jetty module : if you are using the JMX distribution you don't need this category-->

-	<category name="org.mortbay">

-		<priority value="INFO" />

-		<appender-ref ref="SERVER_LOG" />

-	</category>

-	

-	<category name="org.apache.qpid.qman.debug.XmlDebugger">

-		<priority value="DEBUG" />

-		<appender-ref ref="MESSAGES_LOG" />

-	</category>	

-	

-	<root>

-		<priority value="ERROR" />

-	</root>

-	

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+	<!-- QMan Appender-->
+	<appender name="QMAN_LOG"
+		class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="../log/qman.log" />
+		<param name="Append" value="true" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d %-5p [%c{1}] %m%n" />
+		</layout>
+	</appender>
+
+	<!-- XML messages appender -->
+	<appender name="MESSAGES_LOG"
+		class="org.apache.log4j.DailyRollingFileAppender">
+<!--		<param name="File" value="../log/messages.log" /> -->
+		<param name="File" value="../log/messages.log"/>
+		<param name="Append" value="true" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d%n %m%n" />
+		</layout>
+	</appender>
+
+	<!-- Web Server Appender-->
+	<appender name="SERVER_LOG"
+		class="org.apache.log4j.DailyRollingFileAppender">
+		<param name="File" value="../log/server.log" />
+		<param name="Append" value="true" />
+		<param name="DatePattern" value="'.'yyyy-MM-dd" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d %-5p [%c{1}] %m%n" />
+		</layout>
+	</appender>
+
+	<!-- Write to stdout -->
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<param name="Target" value="System.out" />
+		<param name="Threshold" value="DEBUG" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern"
+				value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" />
+		</layout>
+	</appender>
+
+	<!-- Category for QMan module -->
+	<category name="org.apache.qpid.management">
+		<priority value="INFO" />
+		<appender-ref ref="QMAN_LOG" />
+	</category>
+
+	<!-- Category for Jetty module : if you are using the JMX distribution you don't need this category-->
+	<category name="org.mortbay">
+		<priority value="INFO" />
+		<appender-ref ref="SERVER_LOG" />
+	</category>
+	
+	<category name="org.apache.qpid.qman.debug.XmlDebugger">
+		<priority value="DEBUG" />
+		<appender-ref ref="MESSAGES_LOG" />
+	</category>	
+	
+	<root>
+		<priority value="ERROR" />
+	</root>
+	
 </log4j:configuration>
\ No newline at end of file
diff --git a/java/management/client/web.xml b/java/management/client/web.xml
index 30e982c383..54bb50ae4f 100644
--- a/java/management/client/web.xml
+++ b/java/management/client/web.xml
@@ -1,70 +1,50 @@
-<!--

- -

- - Licensed to the Apache Software Foundation (ASF) under one

- - or more contributor license agreements.  See the NOTICE file

- - distributed with this work for additional information

- - regarding copyright ownership.  The ASF licenses this file

- - to you under the Apache License, Version 2.0 (the

- - "License"); you may not use this file except in compliance

- - with the License.  You may obtain a copy of the License at

- - 

- -   http://www.apache.org/licenses/LICENSE-2.0

- - 

- - Unless required by applicable law or agreed to in writing,

- - software distributed under the License is distributed on an

- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- - KIND, either express or implied.  See the License for the

- - specific language governing permissions and limitations

- - under the License.

- -

- -->

-<?xml version="1.0" encoding="UTF-8"?>

-<web-app id="qman" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"

-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">

-	<description>

-		Q-Man is a Management bridge that exposes one (or several) Qpid

-		broker domain model as MBeans that are accessible through the

-		Java Management Extensions (JMX) and / or WS-DM.

-	</description>

-	<display-name>QManEE</display-name>

-	 <context-param>

-        <param-name>tapestry.app-package</param-name>

-        <param-value>org.apache.qpid.management.web.console</param-value>

-    </context-param>

- 	<listener>

-		<description>

-			Provides lifecycle management for QMan module.

-		</description>

-		<display-name>QMan Lifecycle manager</display-name>

-		<listener-class>org.apache.qpid.management.servlet.QManLifeCycleManager</listener-class>

-	</listener>

-	<servlet>

-		<display-name>QMan Proxy Servlet</display-name>

-		<servlet-name>Proxy</servlet-name>

-		<servlet-class>org.apache.qpid.management.servlet.WSDMAdapter</servlet-class>

-		<load-on-startup>2</load-on-startup>

-	</servlet>

-	<servlet>

-		<description>

-			Connects QMAn to one or more brokers depending from what is

-			specified on the given (via system property) configuration

-			file.

-		</description>

-		<display-name>Connect QMan to Broker</display-name>

-		<servlet-name>ConnectQManToBroker</servlet-name>

-		<servlet-class>org.apache.qpid.management.servlet.ConnectQManToBroker</servlet-class>

-		<load-on-startup>1</load-on-startup>

-	</servlet>

-	<servlet-mapping>

-		<servlet-name>ConnectQManToBroker</servlet-name>

-		<url-pattern>/test/*</url-pattern>

-	</servlet-mapping>

-	<servlet-mapping>

-		<servlet-name>Proxy</servlet-name>

-		<url-pattern>/services/*</url-pattern>

-	</servlet-mapping>

-	<login-config>

-		<auth-method>BASIC</auth-method>

-	</login-config>

+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="qman" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	<description>
+		Q-Man is a Management bridge that exposes one (or several) Qpid
+		broker domain model as MBeans that are accessible through the
+		Java Management Extensions (JMX) and / or WS-DM.
+	</description>
+	<display-name>QManEE</display-name>
+	 <context-param>
+        <param-name>tapestry.app-package</param-name>
+        <param-value>org.apache.qpid.management.web.console</param-value>
+    </context-param>
+ 	<listener>
+		<description>
+			Provides lifecycle management for QMan module.
+		</description>
+		<display-name>QMan Lifecycle manager</display-name>
+		<listener-class>org.apache.qpid.management.servlet.QManLifeCycleManager</listener-class>
+	</listener>
+	<servlet>
+		<display-name>QMan Proxy Servlet</display-name>
+		<servlet-name>Proxy</servlet-name>
+		<servlet-class>org.apache.qpid.management.servlet.WSDMAdapter</servlet-class>
+		<load-on-startup>2</load-on-startup>
+	</servlet>
+	<servlet>
+		<description>
+			Connects QMAn to one or more brokers depending from what is
+			specified on the given (via system property) configuration
+			file.
+		</description>
+		<display-name>Connect QMan to Broker</display-name>
+		<servlet-name>ConnectQManToBroker</servlet-name>
+		<servlet-class>org.apache.qpid.management.servlet.ConnectQManToBroker</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet-mapping>
+		<servlet-name>ConnectQManToBroker</servlet-name>
+		<url-pattern>/test/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>Proxy</servlet-name>
+		<url-pattern>/services/*</url-pattern>
+	</servlet-mapping>
+	<login-config>
+		<auth-method>BASIC</auth-method>
+	</login-config>
 </web-app>
\ No newline at end of file