[jboss-cvs] JBoss Messaging SVN: r5684 - in trunk/src: main/org/jboss/messaging/core/config/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 22 04:42:45 EST 2009
Author: jmesnil
Date: 2009-01-22 04:42:45 -0500 (Thu, 22 Jan 2009)
New Revision: 5684
Modified:
trunk/src/config/jbm-configuration.xml
trunk/src/config/queues.xml
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/schemas/jbm-configuration.xsd
trunk/src/schemas/queues.xsd
Log:
JBMESSAGING-1301: Provide xml schemas for our xml config
* predefined queues can now be declared in jbm-configuration.xml
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2009-01-22 08:59:50 UTC (rev 5683)
+++ trunk/src/config/jbm-configuration.xml 2009-01-22 09:42:45 UTC (rev 5684)
@@ -182,6 +182,4 @@
</configuration>
- <queue name="foo" address="bahServ"/>
-
</deployment>
\ No newline at end of file
Modified: trunk/src/config/queues.xml
===================================================================
--- trunk/src/config/queues.xml 2009-01-22 08:59:50 UTC (rev 5683)
+++ trunk/src/config/queues.xml 2009-01-22 09:42:45 UTC (rev 5684)
@@ -118,6 +118,4 @@
<distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
<message-counter-history-day-limit>10</message-counter-history-day-limit>
</queue-settings>
-
- <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 08:59:50 UTC (rev 5683)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-01-22 09:42:45 UTC (rev 5684)
@@ -40,6 +40,7 @@
import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
import org.jboss.messaging.core.config.cluster.DiscoveryGroupConfiguration;
import org.jboss.messaging.core.config.cluster.DivertConfiguration;
+import org.jboss.messaging.core.config.cluster.QueueConfiguration;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.server.JournalType;
import org.jboss.messaging.util.Pair;
@@ -228,6 +229,15 @@
parseDivertConfiguration(dvNode);
}
+ NodeList queueNodes = e.getElementsByTagName("queue");
+
+ for (int i = 0; i < queueNodes.getLength(); i++)
+ {
+ Element queueNode = (Element)queueNodes.item(i);
+
+ parseQueueConfiguration(queueNode);
+ }
+
// Persistence config
largeMessagesDirectory = getString(e, "large-messages-directory", largeMessagesDirectory);
@@ -871,5 +881,17 @@
divertConfigurations.add(config);
}
+ private void parseQueueConfiguration(final Element node)
+ {
+ String name = node.getAttribute("name");
+
+ String address = node.getAttribute("address");
+ String filterString = node.getAttribute("filter");
+
+ boolean durable = Boolean.parseBoolean(node.getAttribute("durable"));
+
+ queueConfigurations.add(new QueueConfiguration(address, name, filterString, durable));
+ }
+
}
Modified: trunk/src/schemas/jbm-configuration.xsd
===================================================================
--- trunk/src/schemas/jbm-configuration.xsd 2009-01-22 08:59:50 UTC (rev 5683)
+++ trunk/src/schemas/jbm-configuration.xsd 2009-01-22 09:42:45 UTC (rev 5684)
@@ -5,17 +5,12 @@
elementFormDefault="qualified" attributeFormDefault="unqualified"
version="1.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:sequence>
</xsd:complexType>
</xsd:element>
@@ -109,6 +104,9 @@
<xsd:element name="divert" type="divertType"
maxOccurs="unbounded" minOccurs="0">
</xsd:element>
+ <xsd:element name="queue" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
<xsd:element name="bridge" type="bridgeType"
maxOccurs="unbounded" minOccurs="0">
</xsd:element>
@@ -421,4 +419,13 @@
<xsd:any></xsd:any>
</xsd:sequence>
</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/src/schemas/queues.xsd
===================================================================
--- trunk/src/schemas/queues.xsd 2009-01-22 08:59:50 UTC (rev 5683)
+++ trunk/src/schemas/queues.xsd 2009-01-22 09:42:45 UTC (rev 5684)
@@ -16,7 +16,6 @@
<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>
@@ -70,15 +69,5 @@
</xsd:element>
</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:complexType>
</xsd:schema>
More information about the jboss-cvs-commits
mailing list