QPID-1574 : Startup scripts & deployment descriptor fixes

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

2 files changed, 95 insertions, 95 deletions

diff --git a/qpid/java/management/client/etc/jetty.xml b/qpid/java/management/client/etc/jetty.xml
index e7033e3e86..11153d0d6f 100644
--- a/qpid/java/management/client/etc/jetty.xml
+++ b/qpid/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/qpid/java/management/client/etc/log4j.xml b/qpid/java/management/client/etc/log4j.xml
index 09d73efe6d..d40d798aee 100644
--- a/qpid/java/management/client/etc/log4j.xml
+++ b/qpid/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