[jboss-cvs] JBoss Messaging SVN: r6658 - in trunk/src: config/stand-alone/non-clustered and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 5 10:47:59 EDT 2009
Author: ataylor
Date: 2009-05-05 10:47:58 -0400 (Tue, 05 May 2009)
New Revision: 6658
Modified:
trunk/src/config/stand-alone/clustered/jbm-jms.xml
trunk/src/config/stand-alone/clustered/jbm-queues.xml
trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
minimalised config files for standalone servers.
Modified: trunk/src/config/stand-alone/clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-jms.xml 2009-05-05 14:47:09 UTC (rev 6657)
+++ trunk/src/config/stand-alone/clustered/jbm-jms.xml 2009-05-05 14:47:58 UTC (rev 6658)
@@ -2,13 +2,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
- <connection-factory name="testConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="testConnectionFactory"/>
- </entries>
- </connection-factory>
-
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
<entries>
@@ -20,17 +13,6 @@
</entries>
</connection-factory>
- <connection-factory name="ServerAckConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
- </entries>
- <pre-acknowledge>true</pre-acknowledge>
- </connection-factory>
-
<connection-factory name="ClusteredConnectionFactory">
<connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
<entries>
@@ -40,20 +22,9 @@
<entry name="java:/ClusteredXAConnectionFactory"/>
</entries>
</connection-factory>
-
- <!--
- <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
- <discovery-group-ref discovery-group-name="dg-group1"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
- -->
-
- <connection-factory name="MyExampleConnectionFactory">
+
+ <!-- example connection factory -->
+ <!-- <connection-factory name="MyExampleConnectionFactory">
<connector-ref connector-name="netty"/>
<entries>
<entry name="/MyExampleConnectionFactory"/>
@@ -63,62 +34,35 @@
</entries>
<ping-period>5000</ping-period>
<call-timeout>30000</call-timeout>
- <!-- This is the window size in bytes to use when using consumer window based flow control -->
+ --><!-- This is the window size in bytes to use when using consumer window based flow control --><!--
<consumer-window-size>1048576</consumer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
+ --><!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control --><!--
<consumer-max-rate>5000</consumer-max-rate>
- <!-- This is the send window size in bytes -->
+ --><!-- This is the send window size in bytes --><!--
<producer-window-size>1048576</producer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
+ --><!-- This is the maximum producer send rate that will be applied when using rate based producer flow control --><!--
<producer-max-rate>100</producer-max-rate>
- <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
+ --><!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets --><!--
<min-large-message-size>10240</min-large-message-size>
- <!-- You can specify the default Client ID to use for connections created using this factory -->
+ --><!-- You can specify the default Client ID to use for connections created using this factory --><!--
<client-id>MyClientID</client-id>
- <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
+ --><!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode --><!--
<dups-ok-batch-size>1048576</dups-ok-batch-size>
- <!-- The batch size in bytes to use when using transactional sessions -->
+ --><!-- The batch size in bytes to use when using transactional sessions --><!--
<transaction-batch-size>1048576</transaction-batch-size>
- <!--Whether or not we use a blocking call when acknowledging a message-->
+ --><!--Whether or not we use a blocking call when acknowledging a message--><!--
<block-on-acknowledge>false</block-on-acknowledge>
- <!--Whether we send non persistent messages synchronously-->
+ --><!--Whether we send non persistent messages synchronously--><!--
<send-np-messages-synchronously>true</send-np-messages-synchronously>
- <!--Whether we send persistent messages synchronously-->
+ --><!--Whether we send persistent messages synchronously--><!--
<send-p-messages-synchronously>true</send-p-messages-synchronously>
- <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
+ --><!--If true, any connections will automatically set a unique group id (per producer) on every message sent--><!--
<auto-group-id>true</auto-group-id>
- <!--if true then the server will pre ack any message before delivery to a consumer-->
+ --><!--if true then the server will pre ack any message before delivery to a consumer--><!--
<pre-acknowledge>false</pre-acknowledge>
</connection-factory>
+-->
- <connection-factory name="TestInVMConnectionFactory">
- <connector-ref connector-name="in-vm"/>
- <entries>
- <entry name="/TestInVMConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestSSLConnectionFactory">
- <connector-ref connector-name="netty-ssl"/>
- <entries>
- <entry name="/TestSSLConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestHttpConnectionFactory">
- <connector-ref connector-name="netty-http"/>
- <entries>
- <entry name="/TestHttpConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
- <entries>
- <entry name="/TestServletConnectionFactory"/>
- </entries>
- </connection-factory>
-
<queue name="MyQueue">
<entry name="MyQueue"/>
</queue>
@@ -128,68 +72,5 @@
<queue name="ExpiryQueue">
<entry name="/queue/ExpiryQueue"/>
</queue>
- <topic name="testTopic">
- <entry name="/topic/testTopic"/>
- </topic>
- <topic name="topic.A">
- <entry name="/topic/topicA"/>
- </topic>
- <topic name="topic.B">
- <entry name="/topic/topicB"/>
- </topic>
- <topic name="securedTopic">
- <entry name="/topic/securedTopic"/>
- </topic>
- <topic name="testDurableTopic">
- <entry name="/topic/testDurableTopic"/>
- </topic>
- <queue name="testQueue">
- <entry name="/queue/testQueue"/>
- </queue>
- <queue name="testGroupQueue">
- <entry name="/queue/testGroupQueue"/>
- </queue>
- <queue name="testPerfQueue">
- <entry name="/queue/testPerfQueue"/>
- </queue>
- <queue name="A">
- <entry name="/queue/A"/>
- </queue>
- <queue name="B">
- <entry name="/queue/B"/>
- </queue>
- <queue name="C">
- <entry name="/queue/C"/>
- </queue>
- <queue name="D">
- <entry name="/queue/D"/>
- </queue>
- <queue name="ex">
- <entry name="/queue/ex"/>
- </queue>
- <queue name="PrivateDLQ">
- <entry name="/queue/PrivateDLQ"/>
- </queue>
- <queue name="PrivateExpiryQueue">
- <entry name="/queue/PrivateExpiryQueue"/>
- </queue>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
- </queue>
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
- </topic>
- <queue name="QueueWithOwnRedeliveryDelay">
- <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
- </queue>
- <topic name="TopicWithOwnRedeliveryDelay">
- <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
- </topic>
- <queue name="testDistributedQueue">
- <entry name="/queue/testDistributedQueue"/>
- </queue>
- <topic name="testDistributedTopic">
- <entry name="/topic/testDistributedTopic"/>
- </topic>
</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/jbm-queues.xml 2009-05-05 14:47:09 UTC (rev 6657)
+++ trunk/src/config/stand-alone/clustered/jbm-queues.xml 2009-05-05 14:47:58 UTC (rev 6658)
@@ -1,6 +1,6 @@
-<settings xmlns="urn:jboss:messaging"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
+<settings xmlns="urn:jboss:messaging"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!-- manangement address -->
<security match="jbm.management">
@@ -9,120 +9,43 @@
<permission type="send" roles="admin"/>
<permission type="manage" roles="admin"/>
</security>
-
- <security match="jms.topic.testTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
- <security match="jms.topic.securedTopic">
- <permission type="send" roles="publisher"/>
- <permission type="consume" roles="publisher"/>
- </security>
-
- <security match="jms.topic.testDurableTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.queue.testQueue">
+ <!--example queue or topic configuration-->
+ <!--<security match="jms.queue.#">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.queue.NoSuchQueue">
+ </security>-->
+ <!--<security match="jms.topic.#">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
- </security>
+ </security>-->
- <security match="jms.topic.NoSuchTopic">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
+ <!-- example temp queue or topic configuration -->
+ <!--<security match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
</security>
- <security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
<security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
</security>-->
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
<!--default security to catch all-->
<security match="#">
- <permission type="createDurableQueue" roles="guest,def"/>
- <permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
</security>
- <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.queue.testDistributedQueue">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.topic.testDistributedTopic">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.testPerfQueue">
- <clustered>false</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.MyQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- </address-settings>
-
- <address-settings match="jms.queue.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>
- </address-settings>
-
<!--default for catch all-->
<address-settings match="#">
<clustered>false</clustered>
Modified: trunk/src/config/stand-alone/non-clustered/jbm-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-05 14:47:09 UTC (rev 6657)
+++ trunk/src/config/stand-alone/non-clustered/jbm-jms.xml 2009-05-05 14:47:58 UTC (rev 6658)
@@ -2,13 +2,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
- <connection-factory name="testConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="testConnectionFactory"/>
- </entries>
- </connection-factory>
-
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
<entries>
@@ -19,41 +12,9 @@
<entry name="java:/XAConnectionFactory"/>
</entries>
</connection-factory>
-
- <connection-factory name="ServerAckConnectionFactory">
- <connector-ref connector-name="netty"/>
- <entries>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
- </entries>
- <pre-acknowledge>true</pre-acknowledge>
- </connection-factory>
-
- <connection-factory name="ClusteredConnectionFactory">
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
- <!--
- <connection-factory name="ClusteredConnectionFactoryWithDiscovery">
- <discovery-group-ref discovery-group-name="dg-group1"/>
- <entries>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
- </entries>
- </connection-factory>
- -->
-
- <connection-factory name="MyExampleConnectionFactory">
+ <!-- example connection factory-->
+ <!--<connection-factory name="MyExampleConnectionFactory">
<connector-ref connector-name="netty"/>
<entries>
<entry name="/MyExampleConnectionFactory"/>
@@ -63,62 +24,35 @@
</entries>
<ping-period>5000</ping-period>
<call-timeout>30000</call-timeout>
- <!-- This is the window size in bytes to use when using consumer window based flow control -->
+ --><!-- This is the window size in bytes to use when using consumer window based flow control --><!--
<consumer-window-size>1048576</consumer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control -->
+ --><!-- This is the maximum producer send rate that will be applied when using rate based consumer flow control --><!--
<consumer-max-rate>5000</consumer-max-rate>
- <!-- This is the send window size in bytes -->
+ --><!-- This is the send window size in bytes --><!--
<producer-window-size>1048576</producer-window-size>
- <!-- This is the maximum producer send rate that will be applied when using rate based producer flow control -->
+ --><!-- This is the maximum producer send rate that will be applied when using rate based producer flow control --><!--
<producer-max-rate>100</producer-max-rate>
- <!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
+ --><!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets --><!--
<min-large-message-size>10240</min-large-message-size>
- <!-- You can specify the default Client ID to use for connections created using this factory -->
+ --><!-- You can specify the default Client ID to use for connections created using this factory --><!--
<client-id>MyClientID</client-id>
- <!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode -->
+ --><!-- The batch size in bytes to use when using the DUPS_OK_ACKNOWLEDGE acknowledgement mode --><!--
<dups-ok-batch-size>1048576</dups-ok-batch-size>
- <!-- The batch size in bytes to use when using transactional sessions -->
+ --><!-- The batch size in bytes to use when using transactional sessions --><!--
<transaction-batch-size>1048576</transaction-batch-size>
- <!--Whether or not we use a blocking call when acknowledging a message-->
+ --><!--Whether or not we use a blocking call when acknowledging a message--><!--
<block-on-acknowledge>false</block-on-acknowledge>
- <!--Whether we send non persistent messages synchronously-->
+ --><!--Whether we send non persistent messages synchronously--><!--
<send-np-messages-synchronously>true</send-np-messages-synchronously>
- <!--Whether we send persistent messages synchronously-->
+ --><!--Whether we send persistent messages synchronously--><!--
<send-p-messages-synchronously>true</send-p-messages-synchronously>
- <!--If true, any connections will automatically set a unique group id (per producer) on every message sent-->
+ --><!--If true, any connections will automatically set a unique group id (per producer) on every message sent--><!--
<auto-group-id>true</auto-group-id>
- <!--if true then the server will pre ack any message before delivery to a consumer-->
+ --><!--if true then the server will pre ack any message before delivery to a consumer--><!--
<pre-acknowledge>false</pre-acknowledge>
- </connection-factory>
+ </connection-factory>-->
- <connection-factory name="TestInVMConnectionFactory">
- <connector-ref connector-name="in-vm"/>
- <entries>
- <entry name="/TestInVMConnectionFactory"/>
- </entries>
- </connection-factory>
- <connection-factory name="TestSSLConnectionFactory">
- <connector-ref connector-name="netty-ssl"/>
- <entries>
- <entry name="/TestSSLConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestHttpConnectionFactory">
- <connector-ref connector-name="netty-http"/>
- <entries>
- <entry name="/TestHttpConnectionFactory"/>
- </entries>
- </connection-factory>
-
- <connection-factory name="TestServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
- <entries>
- <entry name="/TestServletConnectionFactory"/>
- </entries>
- </connection-factory>
-
<queue name="MyQueue">
<entry name="MyQueue"/>
</queue>
@@ -128,68 +62,5 @@
<queue name="ExpiryQueue">
<entry name="/queue/ExpiryQueue"/>
</queue>
- <topic name="testTopic">
- <entry name="/topic/testTopic"/>
- </topic>
- <topic name="topic.A">
- <entry name="/topic/topicA"/>
- </topic>
- <topic name="topic.B">
- <entry name="/topic/topicB"/>
- </topic>
- <topic name="securedTopic">
- <entry name="/topic/securedTopic"/>
- </topic>
- <topic name="testDurableTopic">
- <entry name="/topic/testDurableTopic"/>
- </topic>
- <queue name="testQueue">
- <entry name="/queue/testQueue"/>
- </queue>
- <queue name="testGroupQueue">
- <entry name="/queue/testGroupQueue"/>
- </queue>
- <queue name="testPerfQueue">
- <entry name="/queue/testPerfQueue"/>
- </queue>
- <queue name="A">
- <entry name="/queue/A"/>
- </queue>
- <queue name="B">
- <entry name="/queue/B"/>
- </queue>
- <queue name="C">
- <entry name="/queue/C"/>
- </queue>
- <queue name="D">
- <entry name="/queue/D"/>
- </queue>
- <queue name="ex">
- <entry name="/queue/ex"/>
- </queue>
- <queue name="PrivateDLQ">
- <entry name="/queue/PrivateDLQ"/>
- </queue>
- <queue name="PrivateExpiryQueue">
- <entry name="/queue/PrivateExpiryQueue"/>
- </queue>
- <queue name="QueueWithOwnDLQAndExpiryQueue">
- <entry name="/queue/QueueWithOwnDLQAndExpiryQueue"/>
- </queue>
- <topic name="TopicWithOwnDLQAndExpiryQueue">
- <entry name="/topic/QueueWithOwnDLQAndExpiryQueue"/>
- </topic>
- <queue name="QueueWithOwnRedeliveryDelay">
- <entry name="/queue/QueueWithOwnRedeliveryDelay"/>
- </queue>
- <topic name="TopicWithOwnRedeliveryDelay">
- <entry name="/topic/TopicWithOwnRedeliveryDelay"/>
- </topic>
- <queue name="testDistributedQueue">
- <entry name="/queue/testDistributedQueue"/>
- </queue>
- <topic name="testDistributedTopic">
- <entry name="/topic/testDistributedTopic"/>
- </topic>
</deployment>
\ No newline at end of file
Modified: trunk/src/config/stand-alone/non-clustered/jbm-queues.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/jbm-queues.xml 2009-05-05 14:47:09 UTC (rev 6657)
+++ trunk/src/config/stand-alone/non-clustered/jbm-queues.xml 2009-05-05 14:47:58 UTC (rev 6658)
@@ -2,127 +2,48 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
- <!-- manangement address -->
+ <!-- management address -->
<security match="jbm.management">
<!-- only the admin role can interact with the management address -->
<permission type="consume" roles="admin"/>
<permission type="send" roles="admin"/>
<permission type="manage" roles="admin"/>
</security>
-
- <security match="jms.topic.testTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.topic.securedTopic">
- <permission type="send" roles="publisher"/>
- <permission type="consume" roles="publisher"/>
- </security>
-
- <security match="jms.topic.testDurableTopic">
- <permission type="createDurableQueue" roles="durpublisher"/>
- <permission type="deleteDurableQueue" roles="durpublisher"/>
- <permission type="consume" roles="guest,publisher,durpublisher"/>
- <permission type="send" roles="guest,publisher,durpublisher"/>
- </security>
-
- <security match="jms.queue.testQueue">
+<!--example queue or topic configuration-->
+ <!--<security match="jms.queue.#">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
- </security>
-
- <security match="jms.queue.NoSuchQueue">
+ </security>-->
+ <!--<security match="jms.topic.#">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
- </security>
+ </security>-->
- <security match="jms.topic.NoSuchTopic">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
+ <!-- example temp queue or topic configuration -->
+ <!--<security match="jms.tempqueue.#">
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
</security>
- <security match="jms.tempqueue.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
<security match="jms.temptopic.#">
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
- </security>
-
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.queue.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
</security>-->
- <!--this will catch any word i.e. jms.queue.anything-->
- <!--<security match="jms.topic.#">
- <permission type="consume" roles="guest,publisher"/>
- <permission type="send" roles="guest,publisher"/>
- </security>-->
-
<!--default security to catch all-->
<security match="#">
- <permission type="createDurableQueue" roles="guest,def"/>
- <permission type="deleteDurableQueue" roles="guest,def"/>
- <permission type="createTempQueue" roles="guest,def"/>
- <permission type="deleteTempQueue" roles="guest,def"/>
- <permission type="consume" roles="guest,def"/>
- <permission type="send" roles="guest,def"/>
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createTempQueue" roles="guest"/>
+ <permission type="deleteTempQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
</security>
- <address-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
- <dead-letter-address>jms.queue.PrivateDLQ</dead-letter-address>
- <expiry-address>jms.queue.PrivateExpiryQueue</expiry-address>
- </address-settings>
-
- <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
- <redelivery-delay>5000</redelivery-delay>
- </address-settings>
-
- <address-settings match="jms.queue.testDistributedQueue">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.topic.testDistributedTopic">
- <clustered>true</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.testPerfQueue">
- <clustered>false</clustered>
- </address-settings>
-
- <address-settings match="jms.queue.MyQueue">
- <max-size-bytes>-1</max-size-bytes>
- <page-size-bytes>10485760</page-size-bytes>
- <drop-messages-when-full>false</drop-messages-when-full>
- </address-settings>
-
- <address-settings match="jms.queue.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>
- </address-settings>
-
<!--default for catch all-->
<address-settings match="#">
<clustered>false</clustered>
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-05-05 14:47:09 UTC (rev 6657)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-05-05 14:47:58 UTC (rev 6658)
@@ -260,6 +260,8 @@
// We start the remoting service here - if the server is a backup remoting service needs to be started
// so it can be initialised by the live node
remotingService.start();
+
+ log.info("JBoss Messaging Server version " + getVersion().getFullVersion() + " started");
}
public synchronized void stop() throws Exception
More information about the jboss-cvs-commits
mailing list