[jboss-cvs] JBoss Messaging SVN: r6282 - in trunk: examples/jms/dead-letter and 4 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2009-04-03 04:03:26 -0400 (Fri, 03 Apr 2009)
New Revision: 6282

Added:
   trunk/examples/jms/dead-letter/config/
   trunk/examples/jms/dead-letter/config/jbm-jms.xml
   trunk/examples/jms/dead-letter/config/jbm-queues.xml
   trunk/examples/jms/expiry/config/
   trunk/examples/jms/expiry/config/jbm-jms.xml
Modified:
   trunk/examples/jms/common/config/jbm-jms.xml
   trunk/examples/jms/common/config/jbm-queues.xml
   trunk/src/schemas/jbm-jms.xsd
Log:
added separate config for examples

Modified: trunk/examples/jms/common/config/jbm-jms.xml
===================================================================
--- trunk/examples/jms/common/config/jbm-jms.xml	2009-04-02 16:09:55 UTC (rev 6281)
+++ trunk/examples/jms/common/config/jbm-jms.xml	2009-04-03 08:03:26 UTC (rev 6282)
@@ -14,14 +14,6 @@
       <entry name="/queue/exampleQueue"/>
    </queue>
 
-   <queue name="expiryQueue">
-      <entry name="/queue/expiryQueue"/>
-   </queue>
-
-   <queue name="deadLetterQueue">
-      <entry name="/queue/deadLetterQueue"/>
-   </queue>
-
    <topic name="topic">
       <entry name="/topic/exampleTopic"/>
    </topic>

Modified: trunk/examples/jms/common/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/common/config/jbm-queues.xml	2009-04-02 16:09:55 UTC (rev 6281)
+++ trunk/examples/jms/common/config/jbm-queues.xml	2009-04-03 08:03:26 UTC (rev 6282)
@@ -50,16 +50,4 @@
       <permission type="send" roles="guest,def"/>
    </security>
 
-   <!--default for catch all-->
-   <address-settings match="#">
-      <clustered>false</clustered>
-      <dead-letter-address>queuejms.deadLetterQueue</dead-letter-address>
-      <expiry-address>queuejms.expiryQueue</expiry-address>
-      <redelivery-delay>0</redelivery-delay>
-      <max-delivery-attempts>3</max-delivery-attempts>
-      <max-size-bytes>-1</max-size-bytes>
-      <page-size-bytes>10485760</page-size-bytes>
-      <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
-      <message-counter-history-day-limit>10</message-counter-history-day-limit>
-   </address-settings>
 </settings>

Added: trunk/examples/jms/dead-letter/config/jbm-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-jms.xml	                        (rev 0)
+++ trunk/examples/jms/dead-letter/config/jbm-jms.xml	2009-04-03 08:03:26 UTC (rev 6282)
@@ -0,0 +1,9 @@
+<deployment xmlns="urn:jboss:messaging"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+   <queue name="deadLetterQueue">
+      <entry name="/queue/deadLetterQueue"/>
+   </queue>
+
+</deployment>
\ No newline at end of file

Added: trunk/examples/jms/dead-letter/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-queues.xml	                        (rev 0)
+++ trunk/examples/jms/dead-letter/config/jbm-queues.xml	2009-04-03 08:03:26 UTC (rev 6282)
@@ -0,0 +1,18 @@
+<settings xmlns="urn:jboss:messaging"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+
+   <!--default for catch all-->
+   <address-settings match="queuejms.queue">
+      <clustered>false</clustered>
+      <dead-letter-address>queuejms.deadLetterQueue</dead-letter-address>
+      <expiry-address>queuejms.expiryQueue</expiry-address>
+      <redelivery-delay>0</redelivery-delay>
+      <max-delivery-attempts>3</max-delivery-attempts>
+      <max-size-bytes>-1</max-size-bytes>
+      <page-size-bytes>10485760</page-size-bytes>
+      <distribution-policy-class>org.jboss.messaging.core.server.impl.RoundRobinDistributor</distribution-policy-class>
+      <message-counter-history-day-limit>10</message-counter-history-day-limit>
+   </address-settings>
+   
+</settings>

Added: trunk/examples/jms/expiry/config/jbm-jms.xml
===================================================================
--- trunk/examples/jms/expiry/config/jbm-jms.xml	                        (rev 0)
+++ trunk/examples/jms/expiry/config/jbm-jms.xml	2009-04-03 08:03:26 UTC (rev 6282)
@@ -0,0 +1,9 @@
+<deployment xmlns="urn:jboss:messaging"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
+
+   <queue name="expiryQueue">
+      <entry name="/queue/expiryQueue"/>
+   </queue>
+
+</deployment>
\ No newline at end of file

Modified: trunk/src/schemas/jbm-jms.xsd
===================================================================
--- trunk/src/schemas/jbm-jms.xsd	2009-04-02 16:09:55 UTC (rev 6281)
+++ trunk/src/schemas/jbm-jms.xsd	2009-04-03 08:03:26 UTC (rev 6282)
@@ -11,7 +11,7 @@
    	<xsd:complexType>
    		<xsd:sequence>
    			<xsd:element ref="connection-factory"
-   				maxOccurs="unbounded" minOccurs="1">
+   				maxOccurs="unbounded" minOccurs="0">
    			</xsd:element>
    			<xsd:choice maxOccurs="unbounded" minOccurs="1">
    				<xsd:element ref="queue" maxOccurs="1"