[jboss-cvs] JBoss Messaging SVN: r5705 - trunk/src/config.

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

Author: jmesnil
Date: 2009-01-23 11:23:30 -0500 (Fri, 23 Jan 2009)
New Revision: 5705

Modified:
   trunk/src/config/jbm-configuration.xml
   trunk/src/config/queues.xml
Log:
restored default configuration files

Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2009-01-23 15:04:27 UTC (rev 5704)
+++ trunk/src/config/jbm-configuration.xml	2009-01-23 16:23:30 UTC (rev 5705)
@@ -139,7 +139,6 @@
         <refresh-timeout>10000</refresh-timeout>
       </discovery-group>
 
-<queue name="in-jbm-configuration" address="in-jbm-configuration" filter="wtf > 1"/>
       <!--  Paging configuration -->
       
       <paging-max-threads>10</paging-max-threads>
@@ -183,10 +182,4 @@
 
    </configuration>
    
-   <settings>
-   
-      <queue name="in-jbm-configuration-settings" address="in-jbm-configuration-settings"/>
-   
-</settings>
-   
-   </deployment>
\ No newline at end of file
+</deployment>
\ No newline at end of file

Modified: trunk/src/config/queues.xml
===================================================================
--- trunk/src/config/queues.xml	2009-01-23 15:04:27 UTC (rev 5704)
+++ trunk/src/config/queues.xml	2009-01-23 16:23:30 UTC (rev 5705)
@@ -2,5 +2,120 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
             xsi:schemaLocation="urn:jboss:messaging ../schemas/queues.xsd ">
 
-  <queue name="in-queue-xml" address="in-queue-xml"/>
+   <security match="topicjms.testTopic">
+      <permission type="create" roles="durpublisher"/>
+      <permission type="read" roles="guest,publisher,durpublisher"/>
+      <permission type="write" roles="guest,publisher,durpublisher"/>
+   </security>
+
+   <security match="topicjms.securedTopic">
+      <permission type="write" roles="publisher"/>
+      <permission type="read" roles="publisher"/>
+   </security>
+
+   <security match="topicjms.testDurableTopic">
+      <permission type="create" roles="durpublisher"/>
+      <permission type="read" roles="guest,publisher,durpublisher"/>
+      <permission type="write" roles="guest,publisher,durpublisher"/>
+   </security>
+
+   <security match="queuejms.testQueue">
+      <permission type="read" roles="guest,publisher"/>
+      <permission type="write" roles="guest,publisher"/>
+   </security>
+
+   <security match="queuejms.NoSuchQueue">
+      <permission type="read" roles="guest,publisher"/>
+      <permission type="write" roles="guest,publisher"/>
+   </security>
+
+   <security match="topicjms.NoSuchTopic">
+      <permission type="read" roles="guest,publisher"/>
+      <permission type="write" roles="guest,publisher"/>
+   </security>
+
+   <security match="queuetempjms.*">
+      <permission type="create" roles="guest,def"/>
+      <permission type="read" roles="guest,def"/>
+      <permission type="write" roles="guest,def"/>
+   </security>
+
+   <security match="topictempjms.*">
+      <permission type="create" roles="guest,def"/>
+      <permission type="read" roles="guest,def"/>
+      <permission type="write" roles="guest,def"/>
+   </security>
+
+   <!--this will catch any word i.e. queuejms.anything-->
+   <!--<security match="queuejms.^">
+      <permission type="read" roles="guest,publisher"/>
+      <permission type="write" roles="guest,publisher"/>
+   </security>-->
+
+   <!--this will catch any word i.e. queuejms.anything-->
+   <!--<security match="topicjms.^">
+      <permission type="read" roles="guest,publisher"/>
+      <permission type="write" roles="guest,publisher"/>
+   </security>-->
+
+   <!--default security to catch all-->
+   <security match="*">
+      <permission type="create" roles="guest,def"/>
+      <permission type="read" roles="guest,def"/>
+      <permission type="write" roles="guest,def"/>
+   </security>
+
+   <queue-settings match="queuejms.QueueWithOwnDLQAndExpiryQueue">
+      <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
+      <expiry-address>queuejms.PrivateExpiryQueue</expiry-address>
+   </queue-settings>
+
+   <queue-settings match="topicjms.TopicWithOwnDLQAndExpiryQueue">
+      <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
+      <expiry-address>queuejms.PrivateExpiryQueue</expiry-address>
+   </queue-settings>
+
+   <queue-settings match="queuejms.QueueWithOwnRedeliveryDelay">
+      <redelivery-delay>5000</redelivery-delay>
+   </queue-settings>
+
+   <queue-settings match="topicjms.TopicWithOwnRedeliveryDelay">
+      <redelivery-delay>5000</redelivery-delay>
+   </queue-settings>
+
+   <queue-settings match="queuejms.testDistributedQueue">
+      <clustered>true</clustered>
+   </queue-settings>
+
+   <queue-settings match="topicjms.testDistributedTopic">
+      <clustered>true</clustered>
+   </queue-settings>
+
+   <queue-settings match="queuejms.testPerfQueue">
+      <clustered>false</clustered>
+   </queue-settings>
+
+   <queue-settings match="queuejms.MyQueue">
+      <max-size-bytes>-1</max-size-bytes>
+      <page-size-bytes>10485760</page-size-bytes>
+      <drop-messages-when-full>false</drop-messages-when-full>
+   </queue-settings>
+
+   <queue-settings match="queuejms.testGroupQueue">
+      <max-size-bytes>-1</max-size-bytes>
+      <page-size-bytes>10485760</page-size-bytes>
+      <drop-messages-when-full>false</drop-messages-when-full>
+      <distribution-policy-class>org.jboss.messaging.core.server.impl.GroupingRoundRobinDistributor</distribution-policy-class>
+   </queue-settings>
+
+   <!--default for catch all-->
+   <queue-settings match="*">
+      <clustered>false</clustered>
+      <dead-letter-address>queuejms.DLQ</dead-letter-address>
+      <expiry-address>queuejms.ExpiryQueue</expiry-address>
+      <redelivery-delay>0</redelivery-delay>
+      <max-size-bytes>-1</max-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>
+   </queue-settings>
 </settings>