QPID-1574 : QMan WS-DM Adapter

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

5 files changed, 189 insertions, 55 deletions

diff --git a/java/management/client/etc/jetty.xml b/java/management/client/etc/jetty.xml
new file mode 100644
index 0000000000..e7033e3e86
--- /dev/null
+++ b/java/management/client/etc/jetty.xml
@@ -0,0 +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>

+</Configure>
\ No newline at end of file
diff --git a/java/management/client/etc/log4j.xml b/java/management/client/etc/log4j.xml
new file mode 100644
index 0000000000..09d73efe6d
--- /dev/null
+++ b/java/management/client/etc/log4j.xml
@@ -0,0 +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>

+	

+</log4j:configuration>
\ No newline at end of file
diff --git a/java/management/client/etc/qman-config.xml b/java/management/client/etc/qman-config.xml
index 68ca3c6edf..beb33acfc9 100644
--- a/java/management/client/etc/qman-config.xml
+++ b/java/management/client/etc/qman-config.xml
@@ -18,30 +18,34 @@
  - under the License.
  -
  -->
-
-<configuration>
-  <brokers>
-	<broker>
-	  <host>localhost</host>
-	  <port>5672</port>
-	  <virtual-host>test</virtual-host>
-	  <user>guest</user>
-	  <password>guest</password>
-	  <max-pool-capacity>4</max-pool-capacity>
-	  <initial-pool-capacity>0</initial-pool-capacity>
-	  <max-wait-timeout>-1</max-wait-timeout>
-	</broker>
-<!--
-  <broker>
-	  <host>myhost</host>
-	  <port>5672</port>
-	  <virtual-host>test</virtual-host>
-	  <user>guest</user>
-	  <password>guest</password>
-	  <max-pool-capacity>4</max-pool-capacity>
-	  <initial-pool-capacity>0</initial-pool-capacity>
-	  <max-wait-timeout>-1</max-wait-timeout>
-	</broker>
+<!-- 

+Default configuration for QMan is empty; 

+that is, there's no broker configured at startup.

+If  you want to connect with a running broker when QMan starts up, 

+you can do that uncommenting and editing the template reported below.

 -->
-  </brokers>
+<configuration>

+<!-- 	<brokers>
+		<broker>
+			<host>localhost</host>

+			<port>5672</port>

+			<virtual-host>test</virtual-host>
+	  		<user>guest</user>
+	  		<password>guest</password>
+	  		<max-pool-capacity>4</max-pool-capacity>
+	  		<initial-pool-capacity>0</initial-pool-capacity>
+	  		<max-wait-timeout>-1</max-wait-timeout>
+		</broker>
+		<broker>

+			<host>localhost</host>

+			<port>5672</port>

+			<virtual-host>test</virtual-host>

+	  		<user>guest</user>

+	  		<password>guest</password>

+	  		<max-pool-capacity>4</max-pool-capacity>

+	  		<initial-pool-capacity>0</initial-pool-capacity>

+	  		<max-wait-timeout>-1</max-wait-timeout>

+		</broker>

+  </brokers>

+  --> 

 </configuration>
diff --git a/java/management/client/etc/qman-config.xsd b/java/management/client/etc/qman-config.xsd
new file mode 100644
index 0000000000..38282c63d1
--- /dev/null
+++ b/java/management/client/etc/qman-config.xsd
@@ -0,0 +1,63 @@
+<!--

+	-

+	- 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"?>

+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">

+	<xsd:element name="broker">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="host" minOccurs="1" maxOccurs="1"/>

+				<xsd:element ref="port" minOccurs="1" maxOccurs="1"/>

+				<xsd:element ref="virtual-host" minOccurs="1" maxOccurs="1"/>

+				<xsd:element ref="user" minOccurs="1" maxOccurs="1"/>

+				<xsd:element ref="password" minOccurs="1" maxOccurs="1"/>

+				<xsd:element ref="max-pool-capacity" minOccurs="1" maxOccurs="1"/>

+				<xsd:element ref="initial-pool-capacity" minOccurs="1" maxOccurs="1"/>

+				<xsd:element ref="max-wait-timeout" minOccurs="1" maxOccurs="1"/>

+			</xsd:sequence>

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="brokers">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="broker" maxOccurs="unbounded" />

+			</xsd:sequence>

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="configuration">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="brokers" maxOccurs="1" />

+			</xsd:sequence>

+		</xsd:complexType>

+	</xsd:element>

+

+	<xsd:element name="host" type="xsd:string"/>

+	<xsd:element name="initial-pool-capacity" type="xsd:integer"/>

+	<xsd:element name="max-pool-capacity" type="xsd:integer"/>

+	<xsd:element name="max-wait-timeout" type="xsd:integer"/>

+	<xsd:element name="password" type="xsd:string"/>

+	<xsd:element name="port" type="xsd:integer"/>

+	<xsd:element name="user" type="xsd:string"/>

+	<xsd:element name="virtual-host"type="xsd:string"/>

+	

+</schema>
\ No newline at end of file
diff --git a/java/management/client/etc/qman.log4j b/java/management/client/etc/qman.log4j
deleted file mode 100644
index c2d0b050bb..0000000000
--- a/java/management/client/etc/qman.log4j
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# 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.
-#
-log4j.rootLogger=${root.logging.level}
-
-log4j.logger.org.apache.qpid=ERROR, console
-log4j.additivity.org.apache.qpid=false
-
-log4j.logger.org.apache.qpid.management.client=DEBUG, console
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Threshold=error
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n
-