[jboss-cvs] JBoss Messaging SVN: r5683 - in trunk: src/main/org/jboss/messaging/core/config/impl and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jan 22 03:59:50 EST 2009


Author: jmesnil
Date: 2009-01-22 03:59:50 -0500 (Thu, 22 Jan 2009)
New Revision: 5683

Modified:
   trunk/src/config/jbm-cluster-configuration.xml
   trunk/src/config/jbm-configuration.xml
   trunk/src/config/jbm-jms.xml
   trunk/src/config/jbm-security.xml
   trunk/src/config/queues.xml
   trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
   trunk/src/main/org/jboss/messaging/util/XMLUtil.java
   trunk/src/schemas/jbm-configuration.xsd
   trunk/src/schemas/jbm-jms.xsd
   trunk/src/schemas/jbm-security.xsd
   trunk/src/schemas/queues.xsd
   trunk/tests/config/ConfigurationTest-config.xml
   trunk/tests/config/ConfigurationTest-config2.xml
Log:
JBMESSAGING-1301: Provide xml schemas for our xml config

* use the same namespace for all JBM schema
* updated jbm-configuration.xsd to take into account latest clustering feature (bridge, divert, no more message flow)

Modified: trunk/src/config/jbm-cluster-configuration.xml
===================================================================
--- trunk/src/config/jbm-cluster-configuration.xml	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/config/jbm-cluster-configuration.xml	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,45 +1,10 @@
-<deployment xmlns="urn:jboss:messaging-configuration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging-configuration ../schemas/jbm-configuration.xsd ">
-
+<deployment xmlns="urn:jboss:messaging" 
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
    <configuration>
 
       <clustered>true</clustered>
       
-      <!-- Clustering configuration -->
-      
-      <broadcast-group name="bg-group1">
-      	<local-bind-address>localhost</local-bind-address>
-      	<local-bind-port>1234</local-bind-port>
-      	<group-address>231.7.7.7</group-address>
-      	<group-port>9876</group-port>
-      	<broadcast-period>5000</broadcast-period>
-      	<connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
-      </broadcast-group>
-      
-      <discovery-group name="dg-group1">
-      	<group-address>231.7.7.7</group-address>
-      	<group-port>9876</group-port>
-      	<refresh-timeout>10000</refresh-timeout>
-      </discovery-group>
-      
-      <message-flow name="jms-distributed-queues">
-         <address>jmsqueues.testDistributedQueue</address>
-         <discovery-group-ref discovery-group-name="dg-group1"/>       
-      </message-flow>
-      
-      <message-flow name="jms-distributed-topics">
-         <address>jmstopics.#</address>
-         <discovery-group-ref discovery-group-name="dg-group1"/>
-         <exclusive>false</exclusive>      
-      </message-flow>
-      
-      <!--<message-flow name="example-static-connectors">
-         <address>jmstopics.#</address>
-         <connector-ref connector-name="connector1" backup-connector-name="backup-connector1"/>
-         <connector-ref connector-name="connector2"/>
-         <connector-ref connector-name="connector3"/>
-         <exclusive>false</exclusive>      
-      </message-flow>-->
-      
       <!-- Maximum number of threads to use for scheduled deliveries -->
       <scheduled-max-pool-size>30</scheduled-max-pool-size>
 
@@ -156,6 +121,30 @@
          <param key="jbm.remoting.mina.port" value="${jbm.remoting.mina.port}" type="Integer"/>	                     
       </acceptor>
       
+            <!-- Clustering configuration -->
+      
+      <broadcast-group name="bg-group1">
+        <local-bind-address>localhost</local-bind-address>
+        <local-bind-port>1234</local-bind-port>
+        <group-address>231.7.7.7</group-address>
+        <group-port>9876</group-port>
+        <broadcast-period>5000</broadcast-period>
+        <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+      </broadcast-group>
+      
+      <discovery-group name="dg-group1">
+        <group-address>231.7.7.7</group-address>
+        <group-port>9876</group-port>
+        <refresh-timeout>10000</refresh-timeout>
+      </discovery-group>
+
+<bridge name="foo">
+    <queue-name>toto</queue-name>
+    <forwarding-address>blah</forwarding-address>
+    <filter string="color > 1"/>
+    <connector-ref connector-name="netty"/>
+</bridge>
+
       <!--  Paging configuration -->
       
       <paging-max-threads>10</paging-max-threads>

Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/config/jbm-configuration.xml	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,43 +1,12 @@
-<deployment xmlns="urn:jboss:messaging-configuration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging-configuration ../schemas/jbm-configuration.xsd">
+<deployment xmlns="urn:jboss:messaging" 
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-configuration.xsd">
    <configuration>
 
       <clustered>false</clustered>
       
-      <!-- Clustering configuration -->
       
-      <broadcast-group name="bg-group1">
-      	<local-bind-address>localhost</local-bind-address>
-      	<local-bind-port>1234</local-bind-port>
-      	<group-address>231.7.7.7</group-address>
-      	<group-port>9876</group-port>
-      	<broadcast-period>5000</broadcast-period>
-      	<connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
-      </broadcast-group>
       
-      <discovery-group name="dg-group1">
-      	<group-address>231.7.7.7</group-address>
-      	<group-port>9876</group-port>
-      	<refresh-timeout>10000</refresh-timeout>
-      </discovery-group>
-      
-      <message-flow name="jms-distributed-queues">
-         <address>jmsqueues.#</address>
-         <discovery-group-ref discovery-group-name="dg-group1"/>       
-      </message-flow>
-      
-      <message-flow name="jms-distributed-topics">
-         <address>jmstopics.#</address>
-         <discovery-group-ref discovery-group-name="dg-group1"/>
-         <exclusive>false</exclusive>      
-      </message-flow>
-      
-      <message-flow name="example-static-connectors">
-         <address>jmstopics.#</address>
-         <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
-         <connector-ref connector-name="netty-http"/>
-         <exclusive>false</exclusive>      
-      </message-flow>
-      
       <!-- Maximum number of threads to use for scheduled deliveries -->
       <scheduled-max-pool-size>30</scheduled-max-pool-size>
 
@@ -153,6 +122,23 @@
          <param key="jbm.remoting.mina.port" value="5600" type="Integer"/>	                     
       </acceptor>
       
+      <!-- Clustering configuration -->
+      
+      <broadcast-group name="bg-group1">
+        <local-bind-address>localhost</local-bind-address>
+        <local-bind-port>1234</local-bind-port>
+        <group-address>231.7.7.7</group-address>
+        <group-port>9876</group-port>
+        <broadcast-period>5000</broadcast-period>
+        <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+      </broadcast-group>
+      
+      <discovery-group name="dg-group1">
+        <group-address>231.7.7.7</group-address>
+        <group-port>9876</group-port>
+        <refresh-timeout>10000</refresh-timeout>
+      </discovery-group>
+
       <!--  Paging configuration -->
       
       <paging-max-threads>10</paging-max-threads>
@@ -195,5 +181,7 @@
       <journal-max-aio>10000</journal-max-aio>
 
    </configuration>
-
-</deployment>
+   
+   <queue name="foo" address="bahServ"/>
+   
+   </deployment>
\ No newline at end of file

Modified: trunk/src/config/jbm-jms.xml
===================================================================
--- trunk/src/config/jbm-jms.xml	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/config/jbm-jms.xml	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,6 +1,6 @@
-<deployment xmlns="urn:jboss:messaging-jms" 
+<deployment xmlns="urn:jboss:messaging" 
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xsi:schemaLocation="urn:jboss:messaging-jms ../schemas/jbm-jms.xsd ">
+            xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
 
    <connection-factory name="testConnectionFactory">
       <connector-ref connector-name="netty"/>

Modified: trunk/src/config/jbm-security.xml
===================================================================
--- trunk/src/config/jbm-security.xml	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/config/jbm-security.xml	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging-security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging-security ../schemas/jbm-security.xsd ">
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-security.xsd ">
       <user name="guest" password="guest">
          <role name="guest"/>
       </user>

Modified: trunk/src/config/queues.xml
===================================================================
--- trunk/src/config/queues.xml	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/config/queues.xml	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,6 +1,6 @@
-<deployment xmlns="urn:jboss:messaging-queues" 
+<settings xmlns="urn:jboss:messaging" 
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-            xsi:schemaLocation="urn:jboss:messaging-queues ../schemas/queues.xsd ">
+            xsi:schemaLocation="urn:jboss:messaging ../schemas/queues.xsd ">
 
    <security match="topicjms.testTopic">
       <permission type="create" roles="durpublisher"/>
@@ -119,4 +119,5 @@
       <message-counter-history-day-limit>10</message-counter-history-day-limit>
    </queue-settings>
 
-</deployment>
+   <queue name="foo" address="blah" filter="color > 1" durable="false" />
+</settings>

Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java	2009-01-22 08:59:50 UTC (rev 5683)
@@ -703,27 +703,25 @@
       
       boolean useDuplicateDetection = DEFAULT_USE_DUPLICATE_DETECTION;
       
+      name = brNode.getAttribute("name");
+      
       NodeList children = brNode.getChildNodes();
 
       for (int j = 0; j < children.getLength(); j++)
       {
          Node child = children.item(j);
 
-         if (child.getNodeName().equals("name"))
+         if (child.getNodeName().equals("queue-name"))
          {
-            name = child.getTextContent().trim();
-         }
-         else if (child.getNodeName().equals("queue-name"))
-         {
             queueName = child.getTextContent().trim();
          }
          else if (child.getNodeName().equals("forwarding-address"))
          {
             forwardingAddress = child.getTextContent().trim();
          }
-         else if (child.getNodeName().equals("filter-string"))
+         else if (child.getNodeName().equals("filter"))
          {
-            filterString = child.getTextContent().trim();
+            filterString = child.getAttributes().getNamedItem("string").getNodeValue();
          }
          else if (child.getNodeName().equals("max-batch-size"))
          {
@@ -733,10 +731,6 @@
          {
             maxBatchTime = XMLUtil.parseLong(child);
          }
-         else if (child.getNodeName().equals("discovery-group-ref"))
-         {
-            discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue();
-         }
          else if (child.getNodeName().equals("transformer-class-name"))
          {
             transformerClassName = child.getTextContent().trim();
@@ -761,6 +755,10 @@
          {
             useDuplicateDetection = XMLUtil.parseBoolean(child);
          }
+         else if (child.getNodeName().equals("discovery-group-ref"))
+         {
+            discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue();
+         }
          else if (child.getNodeName().equals("connector-ref"))
          {
             String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue();
@@ -858,9 +856,9 @@
          {
             exclusive = XMLUtil.parseBoolean(child);
          }
-         else if (child.getNodeName().equals("filter-string"))
+         else if (child.getNodeName().equals("filter"))
          {
-            filterString = child.getTextContent().trim();
+            filterString = child.getAttributes().getNamedItem("string").getNodeValue();
          }
          else if (child.getNodeName().equals("transformer-class-name"))
          {

Modified: trunk/src/main/org/jboss/messaging/util/XMLUtil.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/XMLUtil.java	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/main/org/jboss/messaging/util/XMLUtil.java	2009-01-22 08:59:50 UTC (rev 5683)
@@ -22,7 +22,6 @@
 
 package org.jboss.messaging.util;
 
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.StringReader;
@@ -36,9 +35,7 @@
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
@@ -474,8 +471,7 @@
    public static void validate(Node node, String schemaFile) throws Exception
    {
       SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-      Source schemaSource = new StreamSource(ClassLoader.getSystemResourceAsStream(schemaFile));
-      Schema schema = factory.newSchema(schemaSource);
+      Schema schema = factory.newSchema(ClassLoader.getSystemResource(schemaFile));
       Validator validator = schema.newValidator();
 
       // validate the DOM tree

Modified: trunk/src/schemas/jbm-configuration.xsd
===================================================================
--- trunk/src/schemas/jbm-configuration.xsd	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/schemas/jbm-configuration.xsd	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,296 +1,424 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   targetNamespace="urn:jboss:messaging-configuration"
-   xmlns="urn:jboss:messaging-configuration"
-   elementFormDefault="qualified"
-   attributeFormDefault="unqualified"
-   version="1.0">
-   
-   <xsd:element name="deployment">
-   	<xsd:complexType>
-   		<xsd:sequence>
-   			<xsd:element ref="configuration" maxOccurs="1"
-   				minOccurs="1">
-   			</xsd:element>
-   		</xsd:sequence>
-   	</xsd:complexType>
-   </xsd:element>
+	targetNamespace="urn:jboss:messaging" xmlns="urn:jboss:messaging"
+	elementFormDefault="qualified" attributeFormDefault="unqualified"
+	version="1.0">
 
-   <xsd:element name="configuration">
-      <xsd:complexType>
-      		<xsd:sequence>
-      			<xsd:element ref="clustered" maxOccurs="1"
-      				minOccurs="0" />
-      			<xsd:element ref="broadcast-group" maxOccurs="1"
-      				minOccurs="0">
-      			</xsd:element>
-      			<xsd:element ref="discovery-group" maxOccurs="1"
-      				minOccurs="0">
-      			</xsd:element>
-      			<xsd:element ref="message-flow" minOccurs="0"
-      				maxOccurs="unbounded">
-      			</xsd:element>
-      			<xsd:element name="scheduled-max-pool-size"
-      				type="xsd:int" maxOccurs="1" minOccurs="0">
-      				<xsd:annotation>
-      					<xsd:documentation>
-      						Maximum number of threads to use for
-      						scheduled deliveries
-      					</xsd:documentation>
-      				</xsd:annotation>
-      			</xsd:element>
-      			<xsd:element name="require-destinations"
-      				type="xsd:boolean" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="security-enabled"
-      				type="xsd:boolean" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="security-invalidation-interval"
-      				type="xsd:int" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="wild-card-routing-enabled"
-      				type="xsd:boolean" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="management-address"
-      				type="xsd:string" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="management-notification-address"
-      				type="xsd:string" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="jmx-management-enabled"
-      				type="xsd:boolean" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="message-counter-enabled"
-      				type="xsd:boolean" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="connection-scan-period"
-      				type="xsd:long" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-                <xsd:element name="connection-ttl-override"
-                    type="xsd:long" maxOccurs="1" minOccurs="0">
+    <xsd:include schemaLocation="queues.xsd"></xsd:include>
+
+	<xsd:element name="deployment">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="configuration" maxOccurs="1"
+					minOccurs="1">
+				</xsd:element>
+                <xsd:element ref="queue" maxOccurs="unbounded"
+                    minOccurs="0">
                 </xsd:element>
-      			<xsd:element name="transaction-timeout"
-      				type="xsd:long" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="transaction-timeout-scan-period"
-      				type="xsd:long" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="message-expiry-scan-period"
-      				type="xsd:long" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="message-expiry-thread-priority"
-      				type="xsd:int" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-                <xsd:element name="id-cache-size"
-                    type="xsd:int" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="persist-id-cache"
-                    type="xsd:int" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-      			<xsd:element ref="remoting-interceptors" maxOccurs="1"
-      				minOccurs="0">
-      			</xsd:element>
-                <xsd:element name="queue-activation-timeout"
-                    type="xsd:long" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-      			<xsd:element name="backup" type="xsd:boolean" maxOccurs="1" minOccurs="0"></xsd:element>
-      			<xsd:element name="backup-connector-ref"
-      				type="backup-connectorType" maxOccurs="1" minOccurs="0">
-      			</xsd:element>
-      			<xsd:element name="connector" type="connectorType"
-      				minOccurs="0" maxOccurs="unbounded">
-      			</xsd:element>
-      			<xsd:element name="acceptor" type="acceptorType" minOccurs="1" maxOccurs="unbounded"></xsd:element>
-      			<xsd:element name="paging-max-threads"
-                    type="xsd:int" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="paging-directory"
-                    type="xsd:string" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="paging-default-size"
-                    type="xsd:long" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="paging-max-global-size-bytes"
-                    type="xsd:long" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="bindings-directory"
-                    type="xsd:string" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="create-bindings-dir"
-                    type="xsd:boolean" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-directory"
-                    type="xsd:string" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="create-journal-dir"
-                    type="xsd:boolean" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-type"
-                    type="journalType" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-buffer-reuse-size"
-                    type="xsd:int" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-sync-transactional"
-                    type="xsd:boolean" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-sync-non-transactional"
-                    type="xsd:boolean" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-file-size"
-                    type="xsd:long" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-min-files"
-                    type="xsd:int" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="journal-max-aio"
-                    type="xsd:int" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-                <xsd:element name="large-messages-directory"
-                    type="xsd:string" maxOccurs="1" minOccurs="0">
-                </xsd:element>
-        	</xsd:sequence>
-      </xsd:complexType>
-   </xsd:element>
+			</xsd:sequence>
+		</xsd:complexType>		
+	</xsd:element>
 
-   <xsd:element name="clustered" type="xsd:boolean">
-   </xsd:element>
+	<xsd:element name="configuration">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="clustered" maxOccurs="1"
+					minOccurs="0" />
+				<xsd:element name="scheduled-max-pool-size"
+					type="xsd:int" maxOccurs="1" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation>
+							Maximum number of threads to use for
+							scheduled deliveries
+						</xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="require-destinations"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="security-enabled" type="xsd:boolean"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="security-invalidation-interval"
+					type="xsd:int" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="wild-card-routing-enabled"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="management-address" type="xsd:string"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="management-notification-address"
+					type="xsd:string" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="jmx-management-enabled"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="message-counter-enabled"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="connection-scan-period"
+					type="xsd:long" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="connection-ttl-override"
+					type="xsd:long" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="transaction-timeout" type="xsd:long"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="transaction-timeout-scan-period"
+					type="xsd:long" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="message-expiry-scan-period"
+					type="xsd:long" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="message-expiry-thread-priority"
+					type="xsd:int" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="id-cache-size" type="xsd:int"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="persist-id-cache" type="xsd:int"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element ref="remoting-interceptors" maxOccurs="1"
+					minOccurs="0">
+				</xsd:element>
+				<xsd:element name="queue-activation-timeout"
+					type="xsd:long" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="backup" type="xsd:boolean"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="backup-connector-ref"
+					type="backup-connectorType" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="connector" type="connectorType"
+					minOccurs="0" maxOccurs="unbounded">
+				</xsd:element>
+				<xsd:element name="acceptor" type="acceptorType"
+					minOccurs="1" maxOccurs="unbounded">
+				</xsd:element>
+				<xsd:element ref="broadcast-group" maxOccurs="unbounded"
+					minOccurs="0">
+				</xsd:element>
+				<xsd:element ref="discovery-group" maxOccurs="unbounded"
+					minOccurs="0">
+				</xsd:element>
+				<xsd:element name="divert" type="divertType"
+					maxOccurs="unbounded" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="bridge" type="bridgeType"
+					maxOccurs="unbounded" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="cluster" type="clusterType"
+					maxOccurs="unbounded" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="paging-max-threads" type="xsd:int"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="paging-directory" type="xsd:string"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="paging-default-size" type="xsd:long"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="paging-max-global-size-bytes"
+					type="xsd:long" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="bindings-directory" type="xsd:string"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="create-bindings-dir"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-directory" type="xsd:string"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="create-journal-dir"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-type" type="journalType"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-buffer-reuse-size"
+					type="xsd:int" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-sync-transactional"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-sync-non-transactional"
+					type="xsd:boolean" maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-file-size" type="xsd:long"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-min-files" type="xsd:int"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="journal-max-aio" type="xsd:int"
+					maxOccurs="1" minOccurs="0">
+				</xsd:element>
+				<xsd:element name="large-messages-directory"
+					type="xsd:string" maxOccurs="1" minOccurs="0">
+				</xsd:element>
 
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
 
+	<xsd:element name="clustered" type="xsd:boolean"></xsd:element>
 
-    <xsd:element name="local-bind-address" type="xsd:string"></xsd:element>
 
-    <xsd:element name="local-bind-port" type="xsd:int"></xsd:element>
 
-    <xsd:element name="group-address" type="xsd:string"></xsd:element>
+	<xsd:element name="local-bind-address" type="xsd:string"></xsd:element>
 
-    <xsd:element name="group-port" type="xsd:int"></xsd:element>
+	<xsd:element name="local-bind-port" type="xsd:int"></xsd:element>
 
-    <xsd:element name="broadcast-period" type="xsd:int"></xsd:element>
+	<xsd:element name="group-address" type="xsd:string"></xsd:element>
 
-    <xsd:element name="connector-ref" type="connector-refType">
-    </xsd:element>
+	<xsd:element name="group-port" type="xsd:int"></xsd:element>
 
-    <xsd:element name="broadcast-group">
-    	<xsd:complexType>
-    		<xsd:sequence>
-    			<xsd:element ref="local-bind-address" maxOccurs="1"
-    				minOccurs="1">
-    			</xsd:element>
-    			<xsd:element ref="local-bind-port" maxOccurs="1"
-    				minOccurs="1">
-    			</xsd:element>
-    			<xsd:element ref="group-address" maxOccurs="1"
-                    minOccurs="1"></xsd:element>
-    			<xsd:element ref="group-port" maxOccurs="1"
-                    minOccurs="1"></xsd:element>
-    			<xsd:element ref="broadcast-period" maxOccurs="1"
-                    minOccurs="1"></xsd:element>
-    			<xsd:element ref="connector-ref" maxOccurs="1"
-    				minOccurs="1">
-    			</xsd:element>
-    		</xsd:sequence>
-    		<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
-    	</xsd:complexType>
-    </xsd:element>
+	<xsd:element name="broadcast-period" type="xsd:int"></xsd:element>
 
-    <xsd:element name="refresh-timeout" type="xsd:long"></xsd:element>
+	<xsd:element name="connector-ref" type="connector-refType">
+	</xsd:element>
 
-    <xsd:element name="discovery-group">
-    	<xsd:complexType>
-    		<xsd:sequence>
-    			<xsd:element ref="group-address" maxOccurs="1"
-                    minOccurs="1"></xsd:element>
-    			<xsd:element ref="group-port" maxOccurs="1"
-                    minOccurs="1"></xsd:element>
-    			<xsd:element ref="refresh-timeout" maxOccurs="1"
-                    minOccurs="1"></xsd:element>
-    		</xsd:sequence>
-    		<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
-    	</xsd:complexType>
-    </xsd:element>
-    
-        <xsd:element name="message-flow">
-        <xsd:complexType>
-        	<xsd:sequence>
-                <xsd:element name="address" type="xsd:string"></xsd:element>
-                <xsd:choice>
-                    <xsd:element ref="discovery-group-ref" minOccurs="1" maxOccurs="1"></xsd:element>
-                    <xsd:element ref="connector-ref" minOccurs="1" maxOccurs="unbounded"></xsd:element>
-                </xsd:choice>
-                <xsd:element name="exclusive" type="xsd:boolean" minOccurs="0" maxOccurs="1">
-        		</xsd:element>
-            </xsd:sequence>
-        	<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
-        </xsd:complexType>
-        </xsd:element>
+	<xsd:element name="broadcast-group">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="local-bind-address" maxOccurs="1"
+					minOccurs="1">
+				</xsd:element>
+				<xsd:element ref="local-bind-port" maxOccurs="1"
+					minOccurs="1">
+				</xsd:element>
+				<xsd:element ref="group-address" maxOccurs="1"
+					minOccurs="1">
+				</xsd:element>
+				<xsd:element ref="group-port" maxOccurs="1"
+					minOccurs="1">
+				</xsd:element>
+				<xsd:element ref="broadcast-period" maxOccurs="1"
+					minOccurs="0">
+				</xsd:element>
+				<xsd:element ref="connector-ref" maxOccurs="unbounded"
+					minOccurs="0">
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 
-        <xsd:element name="discovery-group-ref">
-        	<xsd:complexType>
-        		<xsd:attribute name="discovery-group-name" type="xsd:IDREF"></xsd:attribute>
-        	</xsd:complexType>
-        </xsd:element>
+	<xsd:element name="refresh-timeout" type="xsd:long"></xsd:element>
 
-        <xsd:complexType name="connector-refType">
-        	<xsd:attribute name="connector-name" type="xsd:IDREF" use="required"></xsd:attribute>
-        	<xsd:attribute name="backup-connector-name" type="xsd:IDREF" use="optional"></xsd:attribute>
-        </xsd:complexType>
+	<xsd:element name="discovery-group">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element ref="group-address" maxOccurs="1"
+					minOccurs="1">
+				</xsd:element>
+				<xsd:element ref="group-port" maxOccurs="1"
+					minOccurs="1">
+				</xsd:element>
+				<xsd:element ref="refresh-timeout" maxOccurs="1"
+					minOccurs="0">
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 
-        <xsd:element name="remoting-interceptors">
-        	<xsd:complexType>
-        		<xsd:sequence>
-        			<xsd:element name="class-name" type="xsd:string" maxOccurs="unbounded" minOccurs="1"></xsd:element>
-        		</xsd:sequence>
-        	</xsd:complexType>
-        </xsd:element>
+	<xsd:element name="message-flow">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="address" type="xsd:string"></xsd:element>
+				<xsd:choice>
+					<xsd:element ref="discovery-group-ref" minOccurs="1"
+						maxOccurs="1">
+					</xsd:element>
+					<xsd:element ref="connector-ref" minOccurs="1"
+						maxOccurs="unbounded">
+					</xsd:element>
+				</xsd:choice>
+				<xsd:element name="exclusive" type="xsd:boolean"
+					minOccurs="0" maxOccurs="1">
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 
-        <xsd:complexType name="paramType">
-        	<xsd:attribute name="key" type="xsd:string" use="required"></xsd:attribute>
-        <xsd:attribute name="value" type="xsd:string" use="required"></xsd:attribute>
-        <xsd:attribute name="type" use="required">
-        		<xsd:simpleType>
-        			<xsd:restriction base="xsd:string">
-        				<xsd:enumeration value="String"></xsd:enumeration>
-        				<xsd:enumeration value="Integer"></xsd:enumeration>
-        				<xsd:enumeration value="Long"></xsd:enumeration>
-        				<xsd:enumeration value="Boolean"></xsd:enumeration>
-        				<xsd:enumeration value="Float"></xsd:enumeration>
-        				<xsd:enumeration value="Double"></xsd:enumeration>
-        			</xsd:restriction>
-        		</xsd:simpleType>
-        	</xsd:attribute>
-        </xsd:complexType>
+	<xsd:element name="discovery-group-ref">
+		<xsd:complexType>
+			<xsd:attribute name="discovery-group-name"
+				type="xsd:IDREF">
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
 
-    <xsd:complexType name="connectorType">
-                    <xsd:sequence>
-                    <xsd:element name="factory-class"
-                        type="xsd:string" minOccurs="1" maxOccurs="1">
-                    </xsd:element>
-                    <xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
-                </xsd:sequence>
-                <xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
-    </xsd:complexType>
+	<xsd:complexType name="connector-refType">
+		<xsd:attribute name="connector-name" type="xsd:IDREF"
+			use="required">
+		</xsd:attribute>
+		<xsd:attribute name="backup-connector-name" type="xsd:IDREF"
+			use="optional">
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="acceptorType">
-                    <xsd:sequence>
-                    <xsd:element name="factory-class"
-                        type="xsd:string" minOccurs="1" maxOccurs="1">
-                    </xsd:element>
-                    <xsd:element name="param" type="paramType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
-                </xsd:sequence>
-                <xsd:attribute name="name" type="xsd:string" use="optional"></xsd:attribute>
-    </xsd:complexType>
+	<xsd:element name="remoting-interceptors">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="class-name" type="xsd:string"
+					maxOccurs="unbounded" minOccurs="1">
+				</xsd:element>
+			</xsd:sequence>
+		</xsd:complexType>
+	</xsd:element>
 
+	<xsd:complexType name="paramType">
+		<xsd:attribute name="key" type="xsd:string" use="required"></xsd:attribute>
+		<xsd:attribute name="value" type="xsd:string" use="required"></xsd:attribute>
+		<xsd:attribute name="type" use="required">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="String"></xsd:enumeration>
+					<xsd:enumeration value="Integer"></xsd:enumeration>
+					<xsd:enumeration value="Long"></xsd:enumeration>
+					<xsd:enumeration value="Boolean"></xsd:enumeration>
+					<xsd:enumeration value="Float"></xsd:enumeration>
+					<xsd:enumeration value="Double"></xsd:enumeration>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:simpleType name="journalType">
-    	<xsd:restriction base="xsd:string">
-    		<xsd:enumeration value="ASYNCIO"></xsd:enumeration>
-    		<xsd:enumeration value="NIO"></xsd:enumeration>
-    	</xsd:restriction>
-    </xsd:simpleType>
+	<xsd:complexType name="connectorType">
+		<xsd:sequence>
+			<xsd:element name="factory-class" type="xsd:string"
+				minOccurs="1" maxOccurs="1">
+			</xsd:element>
+			<xsd:element name="param" type="paramType"
+				maxOccurs="unbounded" minOccurs="0">
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:ID" use="required"></xsd:attribute>
+	</xsd:complexType>
 
-    <xsd:complexType name="backup-connectorType">
-    	<xsd:attribute name="connector-name" type="xsd:IDREF" use="required"></xsd:attribute>
-    </xsd:complexType>
+	<xsd:complexType name="acceptorType">
+		<xsd:sequence>
+			<xsd:element name="factory-class" type="xsd:string"
+				minOccurs="1" maxOccurs="1">
+			</xsd:element>
+			<xsd:element name="param" type="paramType"
+				maxOccurs="unbounded" minOccurs="0">
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string" use="optional"></xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="bridgeType">
+		<xsd:sequence>
+			<xsd:element name="queue-name" type="xsd:string"
+				maxOccurs="1" minOccurs="1">
+			</xsd:element>
+			<xsd:element name="forwarding-address" type="xsd:string"
+				maxOccurs="1" minOccurs="1">
+			</xsd:element>
+			<xsd:element name="filter" type="filterType" maxOccurs="1"
+				minOccurs="0">
+			</xsd:element>
+			<xsd:element name="max-batch-size" type="xsd:int"
+				maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="max-batch-time" type="xsd:long"
+				maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="transformer-class-name" type="xsd:string"
+				maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="retry-interval" type="xsd:long"
+				maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="retry-interval-multiplier"
+				type="xsd:double" maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="max-retries-before-failover"
+				type="xsd:int" maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="max-retries-after-failover"
+				type="xsd:int" maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="use-duplicate-detection"
+				type="xsd:boolean" maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="max-hops" type="xsd:int" maxOccurs="1"
+				minOccurs="0">
+			</xsd:element>
+			<xsd:choice>
+				<xsd:element name="connector-ref"
+					type="connector-refType" minOccurs="1" maxOccurs="1">
+				</xsd:element>
+				<xsd:element name="disccovery-group-ref" minOccurs="1"
+					maxOccurs="1">
+					<xsd:complexType>
+						<xsd:attribute name="discovery-group-name"
+							type="xsd:IDREF" use="required">
+						</xsd:attribute>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:choice>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="divertType">
+		<xsd:sequence>
+			<xsd:element name="routing-name" type="xsd:string"
+				maxOccurs="1" minOccurs="1">
+			</xsd:element>
+			<xsd:element name="address" type="xsd:string" maxOccurs="1"
+				minOccurs="1">
+			</xsd:element>
+			<xsd:element name="forwarding-address" type="xsd:string"
+				maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="filter" type="filterType" maxOccurs="1"
+				minOccurs="0">
+			</xsd:element>
+			<xsd:element name="transformer-class-name" type="xsd:string"
+				maxOccurs="1" minOccurs="0">
+			</xsd:element>
+			<xsd:element name="exclusive" type="xsd:boolean"
+				maxOccurs="1" minOccurs="0">
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="journalType">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="ASYNCIO"></xsd:enumeration>
+			<xsd:enumeration value="NIO"></xsd:enumeration>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="backup-connectorType">
+		<xsd:attribute name="connector-name" type="xsd:IDREF"
+			use="required">
+		</xsd:attribute>
+	</xsd:complexType>
+
+
+
+	<xsd:complexType name="filterType">
+		<xsd:attribute name="string" type="xsd:string" use="required"></xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="clusterType">
+		<xsd:sequence>
+			<xsd:any></xsd:any>
+		</xsd:sequence>
+	</xsd:complexType>
 </xsd:schema>

Modified: trunk/src/schemas/jbm-jms.xsd
===================================================================
--- trunk/src/schemas/jbm-jms.xsd	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/schemas/jbm-jms.xsd	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   targetNamespace="urn:jboss:messaging-jms"
-   xmlns="urn:jboss:messaging-jms"
+   targetNamespace="urn:jboss:messaging"
+   xmlns="urn:jboss:messaging"
    elementFormDefault="qualified"
    attributeFormDefault="unqualified"
    version="1.0">

Modified: trunk/src/schemas/jbm-security.xsd
===================================================================
--- trunk/src/schemas/jbm-security.xsd	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/schemas/jbm-security.xsd	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   targetNamespace="urn:jboss:messaging-security"
-   xmlns="urn:jboss:messaging-security"
+   targetNamespace="urn:jboss:messaging"
+   xmlns="urn:jboss:messaging"
    elementFormDefault="qualified"
    attributeFormDefault="unqualified"
    version="1.0">

Modified: trunk/src/schemas/queues.xsd
===================================================================
--- trunk/src/schemas/queues.xsd	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/src/schemas/queues.xsd	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,19 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   targetNamespace="urn:jboss:messaging-queues"
-   xmlns="urn:jboss:messaging-queues"
+   targetNamespace="urn:jboss:messaging"
+   xmlns="urn:jboss:messaging"
    elementFormDefault="qualified"
    attributeFormDefault="unqualified"
    version="1.0">
    
-   <xsd:element name="deployment">
+   <xsd:element name="settings">
    	<xsd:complexType>
    		<xsd:sequence>
    			<xsd:element ref="security" maxOccurs="unbounded"
    				minOccurs="0">
    			</xsd:element>
-   			<xsd:element ref="queue-settings" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+   			<xsd:element ref="queue-settings" maxOccurs="unbounded"
+   				minOccurs="0">
+   			</xsd:element>
+   			<xsd:element ref="queue" maxOccurs="unbounded" minOccurs="0"></xsd:element>
    		</xsd:sequence>
    	</xsd:complexType>
    </xsd:element>
@@ -68,4 +71,14 @@
    	</xsd:sequence>
    	<xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
    </xsd:complexType>
+
+    <xsd:element name="queue">
+   <xsd:complexType>
+   	<xsd:attribute name="name" type="xsd:string" use="required"></xsd:attribute>
+   	<xsd:attribute name="address" type="xsd:string" use="required"></xsd:attribute>
+   	<xsd:attribute name="filter" type="xsd:string" use="optional"></xsd:attribute>
+   	<xsd:attribute name="durable" type="xsd:boolean" use="optional"></xsd:attribute>
+   </xsd:complexType>
+   </xsd:element>
+   
 </xsd:schema>

Modified: trunk/tests/config/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config.xml	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/tests/config/ConfigurationTest-config.xml	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging-configuration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging-configuration ../../src/schemas/jbm-configuration.xsd ">
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
    <configuration>
       <clustered>true</clustered>
       <scheduled-max-pool-size>12345</scheduled-max-pool-size>        

Modified: trunk/tests/config/ConfigurationTest-config2.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config2.xml	2009-01-22 03:51:57 UTC (rev 5682)
+++ trunk/tests/config/ConfigurationTest-config2.xml	2009-01-22 08:59:50 UTC (rev 5683)
@@ -1,4 +1,4 @@
-<deployment xmlns="urn:jboss:messaging-configuration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging-configuration ../../src/schemas/jbm-configuration.xsd ">
+<deployment xmlns="urn:jboss:messaging" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:messaging ../../src/schemas/jbm-configuration.xsd ">
    <configuration>
      <!-- just use all the defaults -->
      <!--  we must declare at least one acceptor to have a valid configuration -->




More information about the jboss-cvs-commits mailing list