[jboss-cvs] JBoss Messaging SVN: r6323 - in trunk: examples/jms/browser/config and 21 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 6 14:07:34 EDT 2009
Author: timfox
Date: 2009-04-06 14:07:34 -0400 (Mon, 06 Apr 2009)
New Revision: 6323
Modified:
trunk/docs/userguide/en/modules/configuration.xml
trunk/docs/userguide/en/modules/installation.xml
trunk/examples/jms/browser/config/jbm-queues.xml
trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
trunk/examples/jms/clustered-queue/config/jbm-jms.xml
trunk/examples/jms/clustered-queue/config/jbm-queues.xml
trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java
trunk/examples/jms/dead-letter/config/jbm-queues.xml
trunk/examples/jms/durable-subscription/config/jbm-queues.xml
trunk/examples/jms/expiry/config/jbm-queues.xml
trunk/examples/jms/large-message/config/jbm-queues.xml
trunk/examples/jms/paging/config/jbm-queues.xml
trunk/examples/jms/queue-requestor/config/jbm-queues.xml
trunk/examples/jms/queue/config/jbm-queues.xml
trunk/examples/jms/request-reply/config/jbm-queues.xml
trunk/examples/jms/temp-queue/config/jbm-queues.xml
trunk/examples/jms/topic-selector/config/jbm-queues.xml
trunk/examples/jms/topic/config/jbm-queues.xml
trunk/examples/jms/transactional/config/jbm-queues.xml
trunk/src/config/jbm-queues.xml
trunk/src/main/org/jboss/messaging/core/config/TransportConfiguration.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java
trunk/src/main/org/jboss/messaging/jms/JBossQueue.java
trunk/src/main/org/jboss/messaging/jms/JBossTopic.java
trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
Log:
get clustered example to work
Modified: trunk/docs/userguide/en/modules/configuration.xml
===================================================================
--- trunk/docs/userguide/en/modules/configuration.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/docs/userguide/en/modules/configuration.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -296,8 +296,8 @@
against a destination using an hierarchical style match that supports both wild cards ('*') and word
replacement ('^')
</para>
- <para>For instance a destination withname 'queuejms.aqueue.myQueue' would match against 'queuejms.*',
- 'queuejms.aqueue.^', 'queuejms.^.myQueue' and obviously 'queuejms.aqueue.myQueue'. If a destination has
+ <para>For instance a destination withname 'jms.queue.aqueue.myQueue' would match against 'jms.queue.*',
+ 'jms.queue.aqueue.^', 'jms.queue.^.myQueue' and obviously 'jms.queue.aqueue.myQueue'. If a destination has
multiple
matches then the most precise match is used
</para>
@@ -305,34 +305,34 @@
<![CDATA[
<deployment>
- <security match="topicjms.testTopic">
+ <security match="jms.topic.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">
+ <security match="jms.topic.securedTopic">
<permission type="write" roles="publisher"/>
<permission type="read" roles="publisher"/>
</security>
- <security match="topicjms.testDurableTopic">
+ <security match="jms.topic.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">
+ <security match="jms.queue.testQueue">
<permission type="read" roles="guest,publisher"/>
<permission type="write" roles="guest,publisher"/>
</security>
- <security match="queuejms.NoSuchQueue">
+ <security match="jms.queue.NoSuchQueue">
<permission type="read" roles="guest,publisher"/>
<permission type="write" roles="guest,publisher"/>
</security>
- <security match="topicjms.NoSuchTopic">
+ <security match="jms.topic.NoSuchTopic">
<permission type="read" roles="guest,publisher"/>
<permission type="write" roles="guest,publisher"/>
</security>
@@ -349,14 +349,14 @@
<permission type="write" roles="guest,def"/>
</security>
- <!--this will catch any word i.e. queuejms.anything-->
- <!--<security match="queuejms.^">
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.queue.^">
<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.^">
+ <!--this will catch any word i.e. jms.queue.anything-->
+ <!--<security match="jms.topic.^">
<permission type="read" roles="guest,publisher"/>
<permission type="write" roles="guest,publisher"/>
</security>-->
@@ -368,33 +368,33 @@
<permission type="write" roles="guest,def"/>
</security>
- <queue-settings match="queuejms.QueueWithOwnDLQAndExpiryQueue">
+ <queue-settings match="jms.queue.QueueWithOwnDLQAndExpiryQueue">
<dlq>PrivateDLQ</dlq>
- <expiry-queue>queuejms.PrivateExpiryQueue</expiry-queue>
+ <expiry-queue>jms.queue.PrivateExpiryQueue</expiry-queue>
</queue-settings>
- <queue-settings match="topicjms.TopicWithOwnDLQAndExpiryQueue">
+ <queue-settings match="jms.topic.TopicWithOwnDLQAndExpiryQueue">
<dlq>PrivateDLQ</dlq>
- <expiry-queue>queuejms.PrivateExpiryQueue</expiry-queue>
+ <expiry-queue>jms.queue.PrivateExpiryQueue</expiry-queue>
</queue-settings>
- <queue-settings match="queuejms.QueueWithOwnRedeliveryDelay">
+ <queue-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
<redelivery-delay>5000</redelivery-delay>
</queue-settings>
- <queue-settings match="topicjms.TopicWithOwnRedeliveryDelay">
+ <queue-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
<redelivery-delay>5000</redelivery-delay>
</queue-settings>
- <queue-settings match="queuejms.testDistributedQueue">
+ <queue-settings match="jms.queue.testDistributedQueue">
<clustered>true</clustered>
</queue-settings>
- <queue-settings match="topicjms.testDistributedTopic">
+ <queue-settings match="jms.topic.testDistributedTopic">
<clustered>true</clustered>
</queue-settings>
- <queue-settings match="queuejms.testPerfQueue">
+ <queue-settings match="jms.queue.testPerfQueue">
<clustered>false</clustered>
</queue-settings>
@@ -402,7 +402,7 @@
<queue-settings match="*">
<clustered>false</clustered>
<dlq>DLQ</dlq>
- <expiry-queue>queuejms.ExpiryQueue</expiry-queue>
+ <expiry-queue>jms.queue.ExpiryQueue</expiry-queue>
<redelivery-delay>0</redelivery-delay>
<max-size>-1</max-size>
<distribution-policy-class>
Modified: trunk/docs/userguide/en/modules/installation.xml
===================================================================
--- trunk/docs/userguide/en/modules/installation.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/docs/userguide/en/modules/installation.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -82,31 +82,31 @@
10:25:57,707 INFO @main [FileDeploymentManager] Deploying org.jboss.messagin
g.core.deployers.impl.SecurityDeployer at fe0fd9 with urlfile:/home/andy/project
s/jBossMessaging/build/messaging-2.0.0.alpha1/config/queues.xml
- 10:25:57,758 INFO @main [XmlDeployer] deploying topicjms.testTopic
- 10:25:57,761 INFO @main [XmlDeployer] deploying topicjms.securedTopic
- 10:25:57,761 INFO @main [XmlDeployer] deploying topicjms.testDurableTopic
- 10:25:57,762 INFO @main [XmlDeployer] deploying queuejms.testQueue
- 10:25:57,762 INFO @main [XmlDeployer] deploying queuejms.NoSuchQueue
- 10:25:57,763 INFO @main [XmlDeployer] deploying topicjms.NoSuchTopic
+ 10:25:57,758 INFO @main [XmlDeployer] deploying jms.topic.testTopic
+ 10:25:57,761 INFO @main [XmlDeployer] deploying jms.topic.securedTopic
+ 10:25:57,761 INFO @main [XmlDeployer] deploying jms.topic.testDurableTopic
+ 10:25:57,762 INFO @main [XmlDeployer] deploying jms.queue.testQueue
+ 10:25:57,762 INFO @main [XmlDeployer] deploying jms.queue.NoSuchQueue
+ 10:25:57,763 INFO @main [XmlDeployer] deploying jms.topic.NoSuchTopic
10:25:57,763 INFO @main [XmlDeployer] deploying queuetempjms.*
10:25:57,764 INFO @main [XmlDeployer] deploying topictempjms.*
10:25:57,764 INFO @main [XmlDeployer] deploying *
10:25:57,765 INFO @main [FileDeploymentManager] Deploying org.jboss.messagin
g.core.deployers.impl.QueueSettingsDeployer at 1220b36 with urlfile:/home/andy/p
rojects/jBossMessaging/build/messaging-2.0.0.alpha1/config/queues.xml
- 10:25:57,783 INFO @main [XmlDeployer] deploying queuejms.QueueWithOwnDLQAndE
+ 10:25:57,783 INFO @main [XmlDeployer] deploying jms.queue.QueueWithOwnDLQAndE
xpiryQueue
- 10:25:57,784 INFO @main [XmlDeployer] deploying topicjms.TopicWithOwnDLQAndE
+ 10:25:57,784 INFO @main [XmlDeployer] deploying jms.topic.TopicWithOwnDLQAndE
xpiryQueue
- 10:25:57,784 INFO @main [XmlDeployer] deploying queuejms.QueueWithOwnRedeliv
+ 10:25:57,784 INFO @main [XmlDeployer] deploying jms.queue.QueueWithOwnRedeliv
eryDelay
- 10:25:57,784 INFO @main [XmlDeployer] deploying topicjms.TopicWithOwnRedeliv
+ 10:25:57,784 INFO @main [XmlDeployer] deploying jms.topic.TopicWithOwnRedeliv
eryDelay
- 10:25:57,785 INFO @main [XmlDeployer] deploying queuejms.testDistributedQueu
+ 10:25:57,785 INFO @main [XmlDeployer] deploying jms.queue.testDistributedQueu
e
- 10:25:57,785 INFO @main [XmlDeployer] deploying topicjms.testDistributedTopi
+ 10:25:57,785 INFO @main [XmlDeployer] deploying jms.topic.testDistributedTopi
c
- 10:25:57,785 INFO @main [XmlDeployer] deploying queuejms.testPerfQueue
+ 10:25:57,785 INFO @main [XmlDeployer] deploying jms.queue.testPerfQueue
10:25:57,785 INFO @main [XmlDeployer] deploying *
10:26:02,824 INFO @main [FileDeploymentManager] Deploying org.jboss.messagin
g.core.deployers.impl.SecurityManagerDeployer at 1a1ff9 with urlfile:/home/andy/
Modified: trunk/examples/jms/browser/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/browser/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/browser/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration0.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -35,118 +35,55 @@
<!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
<message-expiry-thread-priority>3</message-expiry-thread-priority>
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
<queue-activation-timeout>30000</queue-activation-timeout>
<backup>false</backup>
<persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
<!-- Connectors -->
- <connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6400" type="Integer"/>
- </connector>
-
- <connector name="netty">
+ <connector name="netty-connector">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
</connector>
- <connector name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector>
-
- <connector name="netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
- <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
- </connector>
-
- <connector name="netty-servlet">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
- <param key="jbm.remoting.netty.useservlet" value="true" type="Boolean"/>
- </connector>
-
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
-
<!-- Acceptors -->
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
- </acceptor>
- <!-- Netty standard TCP acceptor -->
- <acceptor name="netty">
+ <acceptor name="netty-acceptor">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
</acceptor>
- <!-- Netty SSL Acceptor
- <acceptor name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </acceptor>
- -->
- <!--Netty HTTP Acceptor-->
- <!--<acceptor name-"netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
- <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
- </acceptor>-->
- <!-- netty invm acceptor, needed for the servlet transport-->
- <!-- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>-->
-
+
<!-- Clustering configuration -->
- <broadcast-group name="bg-group1">
- <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 name="my-broadcast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
</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 name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
</discovery-group>
+
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
<!-- Paging configuration -->
<paging-max-threads>10</paging-max-threads>
- <paging-directory>build/data/paging</paging-directory>
+ <paging-directory>server0/data/paging</paging-directory>
<paging-global-watermark-size>10485760</paging-global-watermark-size>
@@ -154,11 +91,11 @@
<!-- Storage configuration -->
- <bindings-directory>build/data/bindings</bindings-directory>
+ <bindings-directory>server0/data/bindings</bindings-directory>
<create-bindings-dir>true</create-bindings-dir>
- <journal-directory>build/data/journal</journal-directory>
+ <journal-directory>server0/data/journal</journal-directory>
<create-journal-dir>true</create-journal-dir>
@@ -177,7 +114,7 @@
<!-- 10 MB journal file size -->
<journal-file-size>10485760</journal-file-size>
- <journal-min-files>15</journal-min-files>
+ <journal-min-files>2</journal-min-files>
<!-- Maximum simultaneous asynchronous writes accepted by the native layer.
(parameter ignored on NIO)
@@ -185,7 +122,7 @@
-->
<journal-max-aio>10000</journal-max-aio>
- <large-messages-directory>build/data/largeMessages</large-messages-directory>
+ <large-messages-directory>server0/data/largeMessages</large-messages-directory>
</configuration>
Modified: trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/clustered-queue/config/clustered-queue-example-configuration1.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -35,119 +35,56 @@
<!-- the priority of the thread that expires th emessages (between 1 - 10 inclusive)-->
<message-expiry-thread-priority>3</message-expiry-thread-priority>
- <!-- Example interceptors
- <remoting-interceptors>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor1</class-name>
- <class-name>org.jboss.messaging.tests.unit.core.config.impl.TestInterceptor2</class-name>
- </remoting-interceptors>
- -->
-
<queue-activation-timeout>30000</queue-activation-timeout>
<backup>false</backup>
<persist-delivery-count-before-delivery>false</persist-delivery-count-before-delivery>
- <!--
- <backup-connector-ref connector-name="netty-backup"/>
- -->
-
<!-- Connectors -->
-
- <connector name="netty-backup">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6401" type="Integer"/>
- </connector>
-
- <connector name="netty">
+
+ <connector name="netty-connector">
<factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
</connector>
-
- <connector name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5501" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </connector>
-
- <connector name="netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6101" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpclientidletime" value="500" type="Long"/>
- <param key="jbm.remoting.netty.httpclientidlescanperiod" value="500" type="Long"/>
- </connector>
-
- <connector name="netty-servlet">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="8081" type="Integer"/>
- <param key="jbm.remoting.netty.useservlet" value="true" type="Boolean"/>
- </connector>
-
- <connector name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
-
+
<!-- Acceptors -->
-
- <!-- In VM acceptor -->
- <acceptor name="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- <param key="jbm.remoting.invm.serverid" value="0" type="Integer"/>
+
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
</acceptor>
- <!-- Netty standard TCP acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
- <!-- Netty SSL Acceptor
- <acceptor name="netty-ssl">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="5500" type="Integer"/>
- <param key="jbm.remoting.netty.sslenabled" value="true" type="Boolean"/>
- </acceptor>
- -->
- <!--Netty HTTP Acceptor-->
- <!--<acceptor name-"netty-http">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.host" value="localhost" type="String"/>
- <param key="jbm.remoting.netty.port" value="6100" type="Integer"/>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
- <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
- </acceptor>-->
- <!-- netty invm acceptor, needed for the servlet transport-->
- <!-- <acceptor name="netty-invm">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
- </acceptor>-->
-
+
<!-- Clustering configuration -->
-
- <!-- <broadcast-group name="bg-group1">
- <local-bind-port>1234</local-bind-port>
- <group-address>231.7.7.8</group-address>
- <group-port>9877</group-port>
- <broadcast-period>5000</broadcast-period>
- <connector-ref connector-name="netty" backup-connector-name="netty-backup"/>
+
+ <broadcast-group name="my-broacast-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <broadcast-period>100</broadcast-period>
+ <connector-ref connector-name="netty-connector"/>
</broadcast-group>
-
- <discovery-group name="dg-group1">
- <group-address>231.7.7.8</group-address>
- <group-port>9877</group-port>
- <refresh-timeout>10000</refresh-timeout>
+
+ <discovery-group name="my-discovery-group">
+ <group-address>231.7.7.7</group-address>
+ <group-port>9876</group-port>
+ <refresh-timeout>10000</refresh-timeout>
</discovery-group>
--->
+
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+
+
<!-- Paging configuration -->
<paging-max-threads>10</paging-max-threads>
- <paging-directory>build/data/paging</paging-directory>
+ <paging-directory>server1/data/paging</paging-directory>
<paging-global-watermark-size>10485760</paging-global-watermark-size>
@@ -155,11 +92,11 @@
<!-- Storage configuration -->
- <bindings-directory>build/data/bindings</bindings-directory>
+ <bindings-directory>server1/data/bindings</bindings-directory>
<create-bindings-dir>true</create-bindings-dir>
- <journal-directory>build/data/journal</journal-directory>
+ <journal-directory>server1/data/journal</journal-directory>
<create-journal-dir>true</create-journal-dir>
@@ -178,7 +115,7 @@
<!-- 10 MB journal file size -->
<journal-file-size>10485760</journal-file-size>
- <journal-min-files>15</journal-min-files>
+ <journal-min-files>2</journal-min-files>
<!-- Maximum simultaneous asynchronous writes accepted by the native layer.
(parameter ignored on NIO)
@@ -186,7 +123,7 @@
-->
<journal-max-aio>10000</journal-max-aio>
- <large-messages-directory>build/data/largeMessages</large-messages-directory>
+ <large-messages-directory>server1/data/largeMessages</large-messages-directory>
</configuration>
Modified: trunk/examples/jms/clustered-queue/config/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/jbm-jms.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/clustered-queue/config/jbm-jms.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-jms.xsd ">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connector-ref connector-name="netty-connector"/>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
<entry name="java:/ConnectionFactory"/>
Modified: trunk/examples/jms/clustered-queue/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/clustered-queue/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/clustered-queue/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java
===================================================================
--- trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/clustered-queue/src/org/jboss/jms/example/ClusteredQueueExample.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -21,6 +21,9 @@
*/
package org.jboss.jms.example;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -28,8 +31,12 @@
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.naming.InitialContext;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.integration.transports.netty.TransportConstants;
+import org.jboss.messaging.jms.JBossQueue;
+import org.jboss.messaging.jms.client.JBossConnectionFactory;
+
/**
* A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
*
@@ -44,60 +51,82 @@
public boolean runExample() throws Exception
{
- Connection connection = null;
- InitialContext initialContext = null;
+ Connection connection0 = null;
+
+ Connection connection1 = null;
try
{
- // Step 1. Create an initial context to perform the JNDI lookup.
- initialContext = getContext();
+ Queue queue = new JBossQueue("exampleQueue");
- // Step 2. Perfom a lookup on the queue
- Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
+ Map<String, Object> params0 = new HashMap<String, Object>();
+ params0.put(TransportConstants.PORT_PROP_NAME, 5445);
+ TransportConfiguration tc0 = new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyConnectorFactory",
+ params0);
+ ConnectionFactory cf0 = new JBossConnectionFactory(tc0);
- // Step 3. Perform a lookup on the Connection Factory
- ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
+ Map<String, Object> params1 = new HashMap<String, Object>();
+ params1.put(TransportConstants.PORT_PROP_NAME, 5446);
+ TransportConfiguration tc1 = new TransportConfiguration("org.jboss.messaging.integration.transports.netty.NettyConnectorFactory",
+ params1);
+ ConnectionFactory cf1 = new JBossConnectionFactory(tc1);
- // Step 4.Create a JMS Connection
- connection = cf.createConnection();
+ connection0 = cf0.createConnection();
- // Step 5. Create a JMS Session
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ connection1 = cf1.createConnection();
- // Step 6. Create a JMS Message Producer
- MessageProducer producer = session.createProducer(queue);
+ Session session0 = connection0.createSession(false, Session.AUTO_ACKNOWLEDGE);
- // Step 7. Create a Text Message
- TextMessage message = session.createTextMessage("This is a text message");
+ Session session1 = connection1.createSession(false, Session.AUTO_ACKNOWLEDGE);
- System.out.println("Sent message: " + message.getText());
+ connection0.start();
- // Step 8. Send the Message
- producer.send(message);
+ connection1.start();
- // Step 9. Create a JMS Message Consumer
- MessageConsumer messageConsumer = session.createConsumer(queue);
+ MessageConsumer consumer0 = session0.createConsumer(queue);
- // Step 10. Start the Connection
- connection.start();
+ MessageConsumer consumer1 = session1.createConsumer(queue);
+
+ Thread.sleep(5000);
- // Step 11. Receive the message
- TextMessage messageReceived = (TextMessage)messageConsumer.receive(5000);
+ MessageProducer producer = session0.createProducer(queue);
- System.out.println("Received message: " + messageReceived.getText());
+ final int numMessages = 10;
+ for (int i = 0; i < numMessages; i++)
+ {
+ TextMessage message = session0.createTextMessage("This is text message " + i);
+
+ producer.send(message);
+
+ System.out.println("Sent message: " + message.getText());
+ }
+
+ for (int i = 0; i < numMessages; i += 2)
+ {
+ TextMessage message0 = (TextMessage)consumer0.receive(5000);
+
+ System.out.println("Got message: " + message0.getText() + " from node 0");
+
+ TextMessage message1 = (TextMessage)consumer1.receive(5000);
+
+ System.out.println("Got message: " + message1.getText() + " from node 1");
+ }
+
return true;
}
finally
{
// Step 12. Be sure to close our JMS resources!
- if (connection != null)
+ if (connection0 != null)
{
- connection.close();
+ connection0.close();
}
- if (initialContext != null)
+
+ if (connection1 != null)
{
- initialContext.close();
+ connection1.close();
}
+
}
}
Modified: trunk/examples/jms/dead-letter/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/dead-letter/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/dead-letter/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
@@ -13,7 +13,7 @@
</security>
<!--security for dead letter queue-->
- <security match="queuejms.deadLetterQueue">
+ <security match="jms.queue.deadLetterQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
@@ -23,8 +23,8 @@
</security>
<!--override the max-delivery-attempts and dead letter address for the example queue-->
- <address-settings match="queuejms.exampleQueue">
- <dead-letter-address>queuejms.deadLetterQueue</dead-letter-address>
+ <address-settings match="jms.queue.exampleQueue">
+ <dead-letter-address>jms.queue.deadLetterQueue</dead-letter-address>
<max-delivery-attempts>3</max-delivery-attempts>
</address-settings>
Modified: trunk/examples/jms/durable-subscription/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/durable-subscription/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/durable-subscription/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example topic-->
- <security match="topicjms.exampleTopic">
+ <security match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/expiry/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/expiry/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/expiry/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
@@ -13,7 +13,7 @@
</security>
<!--security for dead letter queue-->
- <security match="queuejms.expiryQueue">
+ <security match="jms.queue.expiryQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
@@ -23,8 +23,8 @@
</security>
<!--override the expiry address for the example-->
- <address-settings match="queuejms.exampleQueue">
- <expiry-address>queuejms.expiryQueue</expiry-address>
+ <address-settings match="jms.queue.exampleQueue">
+ <expiry-address>jms.queue.expiryQueue</expiry-address>
</address-settings>
</settings>
Modified: trunk/examples/jms/large-message/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/large-message/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/large-message/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/paging/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/paging/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/paging/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
@@ -12,7 +12,7 @@
<permission type="send" roles="guest"/>
</security>
- <security match="queuejms.pagingQueue">
+ <security match="jms.queue.pagingQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
@@ -21,7 +21,7 @@
<permission type="send" roles="guest"/>
</security>
- <address-settings match="queuejms.pagingQueue">
+ <address-settings match="jms.queue.pagingQueue">
<max-size-bytes>100000</max-size-bytes>
<page-size-bytes>20000</page-size-bytes>
</address-settings>
Modified: trunk/examples/jms/queue/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/queue/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/queue-requestor/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/queue-requestor/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/queue-requestor/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/request-reply/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/request-reply/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/request-reply/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/temp-queue/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/temp-queue/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/temp-queue/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/topic/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/topic/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example topic-->
- <security match="topicjms.exampleTopic">
+ <security match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/topic-selector/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/topic-selector/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/topic-selector/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example topic-->
- <security match="topicjms.exampleTopic">
+ <security match="jms.topic.exampleTopic">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/examples/jms/transactional/config/jbm-queues.xml
===================================================================
--- trunk/examples/jms/transactional/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/examples/jms/transactional/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -3,7 +3,7 @@
xsi:schemaLocation="urn:jboss:messaging ../schemas/jbm-queues.xsd ">
<!--security for example queue-->
- <security match="queuejms.exampleQueue">
+ <security match="jms.queue.exampleQueue">
<permission type="createDurableQueue" roles="guest"/>
<permission type="deleteDurableQueue" roles="guest"/>
<permission type="createTempQueue" roles="guest"/>
Modified: trunk/src/config/jbm-queues.xml
===================================================================
--- trunk/src/config/jbm-queues.xml 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/config/jbm-queues.xml 2009-04-06 18:07:34 UTC (rev 6323)
@@ -10,36 +10,36 @@
<permission type="manage" roles="admin"/>
</security>
- <security match="topicjms.testTopic">
+ <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="topicjms.securedTopic">
+ <security match="jms.topic.securedTopic">
<permission type="send" roles="publisher"/>
<permission type="consume" roles="publisher"/>
</security>
- <security match="topicjms.testDurableTopic">
+ <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="queuejms.testQueue">
+ <security match="jms.queue.testQueue">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
</security>
- <security match="queuejms.NoSuchQueue">
+ <security match="jms.queue.NoSuchQueue">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
</security>
- <security match="topicjms.NoSuchTopic">
+ <security match="jms.topic.NoSuchTopic">
<permission type="consume" roles="guest,publisher"/>
<permission type="send" roles="guest,publisher"/>
</security>
@@ -58,14 +58,14 @@
<permission type="send" roles="guest,def"/>
</security>
- <!--this will catch any word i.e. queuejms.anything-->
- <!--<security match="queuejms.#">
+ <!--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"/>
</security>-->
- <!--this will catch any word i.e. queuejms.anything-->
- <!--<security match="topicjms.#">
+ <!--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>-->
@@ -80,43 +80,43 @@
<permission type="send" roles="guest,def"/>
</security>
- <address-settings match="queuejms.QueueWithOwnDLQAndExpiryQueue">
- <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
- <expiry-address>queuejms.PrivateExpiryQueue</expiry-address>
+ <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="topicjms.TopicWithOwnDLQAndExpiryQueue">
- <dead-letter-address>queuejms.PrivateDLQ</dead-letter-address>
- <expiry-address>queuejms.PrivateExpiryQueue</expiry-address>
+ <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="queuejms.QueueWithOwnRedeliveryDelay">
+ <address-settings match="jms.queue.QueueWithOwnRedeliveryDelay">
<redelivery-delay>5000</redelivery-delay>
</address-settings>
- <address-settings match="topicjms.TopicWithOwnRedeliveryDelay">
+ <address-settings match="jms.topic.TopicWithOwnRedeliveryDelay">
<redelivery-delay>5000</redelivery-delay>
</address-settings>
- <address-settings match="queuejms.testDistributedQueue">
+ <address-settings match="jms.queue.testDistributedQueue">
<clustered>true</clustered>
</address-settings>
- <address-settings match="topicjms.testDistributedTopic">
+ <address-settings match="jms.topic.testDistributedTopic">
<clustered>true</clustered>
</address-settings>
- <address-settings match="queuejms.testPerfQueue">
+ <address-settings match="jms.queue.testPerfQueue">
<clustered>false</clustered>
</address-settings>
- <address-settings match="queuejms.MyQueue">
+ <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="queuejms.testGroupQueue">
+ <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>
@@ -126,8 +126,8 @@
<!--default for catch all-->
<address-settings match="#">
<clustered>false</clustered>
- <dead-letter-address>queuejms.DLQ</dead-letter-address>
- <expiry-address>queuejms.ExpiryQueue</expiry-address>
+ <dead-letter-address>jms.queue.DLQ</dead-letter-address>
+ <expiry-address>jms.queue.ExpiryQueue</expiry-address>
<redelivery-delay>0</redelivery-delay>
<max-size-bytes>-1</max-size-bytes>
<page-size-bytes>10485760</page-size-bytes>
Modified: trunk/src/main/org/jboss/messaging/core/config/TransportConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/TransportConfiguration.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/main/org/jboss/messaging/core/config/TransportConfiguration.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -26,7 +26,6 @@
import java.util.Map;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.utils.SimpleString;
import org.jboss.messaging.utils.UUIDGenerator;
/**
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -72,11 +72,19 @@
// Attributes ----------------------------------------------------------------------
private String configurationUrl = DEFAULT_CONFIGURATION_URL;
+
+ private boolean started;
+
// Public -------------------------------------------------------------------------
- public void start() throws Exception
+ public synchronized void start() throws Exception
{
+ if (started)
+ {
+ return;
+ }
+
URL url = getClass().getClassLoader().getResource(configurationUrl);
Reader reader = new InputStreamReader(url.openStream());
String xml = org.jboss.messaging.utils.XMLUtil.readerToString(reader);
@@ -293,7 +301,16 @@
wildcardRoutingEnabled = getBoolean(e, "wild-card-routing-enabled", wildcardRoutingEnabled);
messageCounterEnabled = getBoolean(e, "message-counter-enabled", messageCounterEnabled);
+
+ started = true;
}
+
+ public synchronized void stop() throws Exception
+ {
+ super.stop();
+
+ started = false;
+ }
public String getConfigurationUrl()
{
@@ -551,8 +568,12 @@
{
Node child = children.item(j);
- if (child.getNodeName().equals("retry-interval"))
+ if (child.getNodeName().equals("address"))
{
+ address = child.getTextContent().trim();
+ }
+ else if (child.getNodeName().equals("retry-interval"))
+ {
retryInterval = XMLUtil.parseLong(child);
}
else if (child.getNodeName().equals("use-duplicate-detection"))
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterConnectionImpl.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -467,15 +467,6 @@
}
}
-// private SimpleString generateQueueName(final SimpleString clusterName,
-// final Pair<TransportConfiguration, TransportConfiguration> connectorPair) throws Exception
-// {
-// return new SimpleString("sf." + name +
-// "." +
-// connectorPair.a.toString() +
-// "-" +
-// (connectorPair.b == null ? "null" : connectorPair.b.toString()));
-// }
// Inner classes -----------------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/ClusterManagerImpl.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -459,7 +459,7 @@
if (config.getAddress() == null)
{
- log.warn("Must specify an address for each cluster. This one will not be deployed.");
+ log.warn("Must specify an address for each cluster connection. This one will not be deployed.");
return;
}
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -220,7 +220,7 @@
buff.putInt(remoteQueueID);
- message.putBytesProperty(idsHeaderName, ids);
+ message.putBytesProperty(idsHeaderName, ids);
}
public synchronized void addConsumer(final SimpleString filterString) throws Exception
Modified: trunk/src/main/org/jboss/messaging/jms/JBossQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossQueue.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/main/org/jboss/messaging/jms/JBossQueue.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -25,6 +25,7 @@
import javax.jms.JMSException;
import javax.jms.Queue;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.utils.SimpleString;
/**
@@ -38,9 +39,12 @@
{
// Constants -----------------------------------------------------
+ private static final Logger log = Logger.getLogger(JBossQueue.class);
+
+
private static final long serialVersionUID = -1106092883162295462L;
- public static final String JMS_QUEUE_ADDRESS_PREFIX = "queuejms.";
+ public static final String JMS_QUEUE_ADDRESS_PREFIX = "jms.queue.";
// Static --------------------------------------------------------
@@ -54,12 +58,12 @@
// Constructors --------------------------------------------------
public JBossQueue(final String name)
- {
+ {
super(JMS_QUEUE_ADDRESS_PREFIX + name, name);
}
public JBossQueue(final String address, final String name)
- {
+ {
super(address, name);
}
Modified: trunk/src/main/org/jboss/messaging/jms/JBossTopic.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/JBossTopic.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/src/main/org/jboss/messaging/jms/JBossTopic.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -41,7 +41,7 @@
private static final long serialVersionUID = 7873614001276404156L;
- public static final String JMS_TOPIC_ADDRESS_PREFIX = "topicjms.";
+ public static final String JMS_TOPIC_ADDRESS_PREFIX = "jms.topic.";
private static final char SEPARATOR = '.';
Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/tools/container/LocalTestServer.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -340,7 +340,7 @@
public void configureSecurityForDestination(String destName, boolean isQueue, Set<Role> roles) throws Exception
{
- String destination = (isQueue ? "queuejms." : "topicjms.") + destName;
+ String destination = (isQueue ? "jms.queue." : "jms.topic.") + destName;
if (roles != null)
{
getMessagingServer().getSecurityRepository().addMatch(destination, roles);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-04-06 16:45:23 UTC (rev 6322)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-04-06 18:07:34 UTC (rev 6323)
@@ -40,7 +40,7 @@
{
private SecurityDeployer deployer;
- private String conf = "<security match=\"topicjms.testTopic\">\n" +
+ private String conf = "<security match=\"jms.topic.testTopic\">\n" +
" <permission type=\"createDurableQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"deleteDurableQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"consume\" roles=\"guest,publisher,durpublisher\"/>\n" +
@@ -48,7 +48,7 @@
" <permission type=\"manage\" roles=\"guest,publisher,durpublisher\"/>\n" +
" </security>";
- private String conf2 = "<security match=\"topicjms.testQueue\">\n" +
+ private String conf2 = "<security match=\"jms.topic.testQueue\">\n" +
" <permission type=\"createTempQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"deleteTempQueue\" roles=\"durpublisher\"/>\n" +
" <permission type=\"consume\" roles=\"guest,publisher,durpublisher\"/>\n" +
@@ -74,7 +74,7 @@
{
Element e = org.jboss.messaging.utils.XMLUtil.stringToElement(conf);
deployer.deploy(e);
- HashSet<Role> roles = (HashSet<Role>) repository.getMatch("topicjms.testTopic");
+ HashSet<Role> roles = (HashSet<Role>) repository.getMatch("jms.topic.testTopic");
assertNotNull(roles);
assertEquals(3, roles.size());
for (Role role : roles)
@@ -120,7 +120,7 @@
{
deployer.deploy(org.jboss.messaging.utils.XMLUtil.stringToElement(conf));
deployer.deploy(org.jboss.messaging.utils.XMLUtil.stringToElement(conf2));
- HashSet<Role> roles = (HashSet<Role>) repository.getMatch("topicjms.testTopic");
+ HashSet<Role> roles = (HashSet<Role>) repository.getMatch("jms.topic.testTopic");
assertNotNull(roles);
assertEquals(3, roles.size());
for (Role role : roles)
@@ -160,7 +160,7 @@
fail("unexpected role");
}
}
- roles = (HashSet<Role>) repository.getMatch("topicjms.testQueue");
+ roles = (HashSet<Role>) repository.getMatch("jms.topic.testQueue");
assertNotNull(roles);
assertEquals(3, roles.size());
for (Role role : roles)
@@ -205,7 +205,7 @@
public void testNoRolesAdded() throws Exception
{
deployer.deploy(org.jboss.messaging.utils.XMLUtil.stringToElement(noRoles));
- HashSet<Role> roles = (HashSet<Role>) repository.getMatch("topicjms.testQueue");
+ HashSet<Role> roles = (HashSet<Role>) repository.getMatch("jms.topic.testQueue");
assertNull(roles);
}
}
More information about the jboss-cvs-commits
mailing list