[jboss-cvs] JBoss Messaging SVN: r6443 - in trunk: examples/jms/application-layer-failover/server1 and 46 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 16 05:24:46 EDT 2009
Author: jmesnil
Date: 2009-04-16 05:24:45 -0400 (Thu, 16 Apr 2009)
New Revision: 6443
Removed:
trunk/examples/jms/browser/config/
Modified:
trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml
trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml
trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml
trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml
trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml
trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml
trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
trunk/examples/jms/bridge/server0/jbm-configuration.xml
trunk/examples/jms/bridge/server0/jbm-jms.xml
trunk/examples/jms/bridge/server1/jbm-configuration.xml
trunk/examples/jms/bridge/server1/jbm-jms.xml
trunk/examples/jms/browser/server0/jbm-configuration.xml
trunk/examples/jms/browser/server0/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml
trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml
trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml
trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml
trunk/examples/jms/clustered-queue/server0/jbm-jms.xml
trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml
trunk/examples/jms/clustered-queue/server1/jbm-jms.xml
trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml
trunk/examples/jms/clustered-topic/server0/jbm-jms.xml
trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml
trunk/examples/jms/clustered-topic/server1/jbm-jms.xml
trunk/examples/jms/dead-letter/server0/jbm-configuration.xml
trunk/examples/jms/dead-letter/server0/jbm-jms.xml
trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml
trunk/examples/jms/durable-subscription/server0/jbm-jms.xml
trunk/examples/jms/expiry/server0/jbm-configuration.xml
trunk/examples/jms/expiry/server0/jbm-jms.xml
trunk/examples/jms/http-transport/server0/jbm-configuration.xml
trunk/examples/jms/http-transport/server0/jbm-jms.xml
trunk/examples/jms/jmx/server0/jbm-configuration.xml
trunk/examples/jms/jmx/server0/jbm-jms.xml
trunk/examples/jms/large-message/server0/jbm-configuration.xml
trunk/examples/jms/large-message/server0/jbm-jms.xml
trunk/examples/jms/management/server0/jbm-configuration.xml
trunk/examples/jms/management/server0/jbm-jms.xml
trunk/examples/jms/message-priority/server0/jbm-configuration.xml
trunk/examples/jms/message-priority/server0/jbm-jms.xml
trunk/examples/jms/paging/server0/jbm-configuration.xml
trunk/examples/jms/paging/server0/jbm-jms.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml
trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml
trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml
trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml
trunk/examples/jms/queue-requestor/server0/jbm-jms.xml
trunk/examples/jms/queue-selector/server0/jbm-configuration.xml
trunk/examples/jms/queue-selector/server0/jbm-jms.xml
trunk/examples/jms/queue/server0/jbm-configuration.xml
trunk/examples/jms/queue/server0/jbm-jms.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml
trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
trunk/examples/jms/request-reply/server0/jbm-configuration.xml
trunk/examples/jms/request-reply/server0/jbm-jms.xml
trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml
trunk/examples/jms/scheduled-message/server0/jbm-jms.xml
trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml
trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml
trunk/examples/jms/temp-queue/server0/jbm-configuration.xml
trunk/examples/jms/temp-queue/server0/jbm-jms.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml
trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml
trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml
trunk/examples/jms/topic/server0/jbm-configuration.xml
trunk/examples/jms/topic/server0/jbm-jms.xml
trunk/examples/jms/transactional/server0/jbm-configuration.xml
trunk/examples/jms/transactional/server0/jbm-jms.xml
trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml
trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml
trunk/examples/jms/xa-receive/server0/jbm-configuration.xml
trunk/examples/jms/xa-receive/server0/jbm-jms.xml
trunk/examples/jms/xa-send/server0/jbm-configuration.xml
trunk/examples/jms/xa-send/server0/jbm-jms.xml
trunk/src/config/jbm-cluster-configuration.xml
trunk/src/config/jbm-configuration.xml
trunk/src/config/jbm-jms.xml
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
trunk/src/schemas/jbm-configuration.xsd
trunk/src/schemas/jbm-jms.xsd
trunk/src/schemas/jbm-queues.xsd
trunk/tests/config/ConfigurationTest-config.xml
trunk/tests/config/ConfigurationTest-defaults.xml
trunk/tests/config/ConfigurationTest-full-config.xml
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java
Log:
JBMESSAGING-1596: make XML Schemas simpler to read by unordering elements
* used xsd:all instead of xsd:sequence to allow unordered configuration
* put elements with multiple occurences in a container (e.g. all <connector> elements go to inside a <connectors> element)
* updated configuration files (src + tests + examples)
Modified: trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,18 +6,21 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <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>
+ <connectors>
+ <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>
+ </connectors>
<!-- Acceptors -->
- <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>
+ <acceptors>
+ <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>
+ </acceptors>
<!-- Other config -->
Modified: trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/application-layer-failover/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,18 +7,21 @@
<!-- Connectors -->
- <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>
+ <connectors>
+ <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>
+ </connectors>
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/application-layer-failover/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/automatic-failover/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -9,18 +9,21 @@
<!-- Connectors -->
- <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>
+ <connectors>
+ <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>
+ </connectors>
+
+ <!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <!-- Acceptors -->
-
- <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>
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/automatic-failover/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/automatic-failover/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/automatic-failover/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -9,23 +9,26 @@
<!-- Connectors -->
- <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>
+ <connectors>
+ <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="backup-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="backup-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/automatic-failover/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/automatic-failover/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/bridge/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/bridge/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,39 +6,44 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <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>
+ <connectors>
+ <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 to the other node -->
- <connector name="remote-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
-
+ <!-- Connector to the other node -->
+ <connector name="remote-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
- <queue name="jms.queue.sausage-factory" address="jms.queue.sausage-factory"/>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
+ <queues>
+ <queue name="jms.queue.sausage-factory" address="jms.queue.sausage-factory"/>
+ </queues>
+
<!-- We set-up a bridge that forwards from a queue on this node to an address on another node.
We specify a filter with the bridge, and a transformer too. The filter and transformer are optional -->
-
- <bridge name="my-bridge">
- <queue-name>jms.queue.sausage-factory</queue-name>
- <forwarding-address>jms.queue.mincing-machine</forwarding-address>
- <filter string="name='aardvark'"/>
- <transformer-class-name>org.jboss.jms.example.HatColourChangeTransformer</transformer-class-name>
- <reconnect-attempts>-1</reconnect-attempts>
- <connector-ref connector-name="remote-connector"/>
- </bridge>
-
+ <bridges>
+ <bridge name="my-bridge">
+ <queue-name>jms.queue.sausage-factory</queue-name>
+ <forwarding-address>jms.queue.mincing-machine</forwarding-address>
+ <filter string="name='aardvark'"/>
+ <transformer-class-name>org.jboss.jms.example.HatColourChangeTransformer</transformer-class-name>
+ <reconnect-attempts>-1</reconnect-attempts>
+ <connector-ref connector-name="remote-connector"/>
+ </bridge>
+ </bridges>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/bridge/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/bridge/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/bridge/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/bridge/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,18 +7,21 @@
<!-- Connectors -->
- <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>
+ <connectors>
+ <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>
+ </connectors>
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/bridge/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/bridge/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/browser/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/browser/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,19 +5,21 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/browser/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/browser/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/browser/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,33 +7,40 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
- <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="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
-
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/client-side-load-balancing/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<discovery-group-ref discovery-group-name="my-discovery-group"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,33 +7,40 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
- <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="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
-
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/client-side-load-balancing/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<discovery-group-ref discovery-group-name="my-discovery-group"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,34 +6,39 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
- </connector>
-
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
+ </connector>
+ </connectors>
+
<!-- Acceptors -->
-
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
- </acceptor>
-
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5447" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
<!-- Clustering configuration -->
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
- <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="my-discovery-group">
- <group-address>231.7.7.7</group-address>
- <group-port>9876</group-port>
- <refresh-timeout>10000</refresh-timeout>
- </discovery-group>
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml
===================================================================
--- trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/client-side-load-balancing/server2/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<discovery-group-ref discovery-group-name="my-discovery-group"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,45 +6,50 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
+
+ <!-- Clustering configuration -->
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
- <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>
+ <cluster-connections>
+ <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>
+ </cluster-connections>
- <!-- Clustering configuration -->
-
- <!-- Clustering configuration -->
-
- <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="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>
-
<!-- other configuration -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-durable-subscription/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,44 +6,50 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
+ <cluster-connections>
+ <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>
+ </cluster-connections>
- <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="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>
-
-
<!-- other configuration -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-durable-subscription/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-queue/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,42 +7,50 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
-
- <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="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>
-
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
+ <cluster-connections>
+ <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>
+ </cluster-connections>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/clustered-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-queue/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-queue/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,43 +6,50 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
-
- <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="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>
-
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
+ <cluster-connections>
+ <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>
+ </cluster-connections>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/clustered-queue/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-queue/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-topic/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,44 +7,51 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
- <!-- Clustering configuration -->
-
- <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="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>
-
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
+ <cluster-connections>
+ <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>
+ </cluster-connections>
+
<!-- other configuration -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/clustered-topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-topic/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-topic/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,44 +6,50 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
+ <cluster-connections>
+ <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>
+ </cluster-connections>
- <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="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>
-
-
<!-- other configuration -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/clustered-topic/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/clustered-topic/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/dead-letter/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/dead-letter/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,19 +5,21 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/dead-letter/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/dead-letter/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/durable-subscription/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,22 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
- <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>
+ <acceptors>
+ <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>
+ </acceptors>
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/durable-subscription/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/durable-subscription/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/expiry/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/expiry/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,19 +5,21 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/expiry/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/expiry/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/expiry/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/http-transport/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/http-transport/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,21 +5,24 @@
<!-- Connectors -->
- <connector name="netty-connector">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
- </connector>
-
+ <connectors>
+ <connector name="netty-connector">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
+ </connector>
+ </connectors>
+
<!-- Acceptors -->
- <acceptor name="netty-acceptor">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
- <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
- </acceptor>
+ <acceptors>
+ <acceptor name="netty-acceptor">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.httpenabled" value="true" type="Boolean"/>
+ <param key="jbm.remoting.netty.port" value="8080" type="Integer"/>
+ </acceptor>
+ </acceptors>
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/http-transport/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/http-transport/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/jmx/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/jmx/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,20 +7,21 @@
<jmx-management-enabled>true</jmx-management-enabled>
<!-- Connectors -->
-
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </connector>
-
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </connector>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
+ </acceptor>
+ </acceptors>
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5445" type="Integer"/>
- </acceptor>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/jmx/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/jmx/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/jmx/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/large-message/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/large-message/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/large-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/large-message/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/large-message/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,13 +4,14 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
-
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
<!-- When using this ConnectionFactory, messages beyond this limit are considered largeMessages and will be sent using smaller packets -->
- <big-message-size>10240</big-message-size>
+ <min-large-message-size>10240</min-large-message-size>
</connection-factory>
Modified: trunk/examples/jms/management/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/management/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,15 +5,19 @@
<management-address>jbm.management</management-address>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </connector>
-
+ <connectors>
+ <connector name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
+ </connectors>
+
<!-- Netty standard TCP acceptor -->
- <acceptor name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- </acceptor>
-
+ <acceptors>
+ <acceptor name="netty">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
+
</configuration>
</deployment>
Modified: trunk/examples/jms/management/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/management/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/management/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/message-priority/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/message-priority/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/message-priority/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/message-priority/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/paging/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/paging/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,22 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/paging/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/paging/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/paging/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,19 +5,21 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
@@ -15,4 +17,4 @@
<entry name="/queue/exampleQueue"/>
</queue>
-</deployment>
\ No newline at end of file
+</deployment>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -6,43 +6,50 @@
<clustered>true</clustered>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
- <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="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>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
-
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-message-redistribution/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -7,42 +7,50 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
-
- <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>
-
+ <acceptors>
+ <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>
+ </acceptors>
+
<!-- Clustering configuration -->
-
- <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="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>false</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <discovery-group-ref discovery-group-name="my-discovery-group"/>
- </cluster-connection>
-
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
+
+ <discovery-groups>
+ <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>
+ </discovery-groups>
+
+ <cluster-connections>
+ <cluster-connection name="my-cluster">
+ <address>jms</address>
+ <retry-interval>500</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>false</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <discovery-group-ref discovery-group-name="my-discovery-group"/>
+ </cluster-connection>
+ </cluster-connections>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-message-redistribution/server1/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-requestor/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,19 +5,21 @@
<!-- Connectors -->
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/queue-requestor/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-requestor/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/queue-selector/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-selector/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/queue-selector/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/queue-selector/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,32 +5,35 @@
<!-- Connectors -->
- <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>
+ <connectors>
+ <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>
+
+ <!-- We just use this connector so we can send management operations while the other acceptor
+ is stopped -->
+ <connector name="netty-connector2">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </connector>
+ </connectors>
- <!-- We just use this connector so we can send management operations while the other acceptor
- is stopped -->
- <connector name="netty-connector2">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </connector>
-
<!-- Acceptors -->
+ <acceptors>
+ <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>
- <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>
-
- <!-- We just use this acceptor so we can send management operations while the other acceptor
- is stopped -->
- <acceptor name="netty-acceptor2">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
- </acceptor>
-
+ <!-- We just use this acceptor so we can send management operations while the other acceptor
+ is stopped -->
+ <acceptor name="netty-acceptor2">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="5446" type="Integer"/>
+ </acceptor>
+ </acceptors>
+
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/reconnect-same-node/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,11 +4,13 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
-
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
+
<!-- Pause 1 second between connect attempts -->
<retry-interval>1000</retry-interval>
@@ -29,7 +31,9 @@
<!-- This is used by the example to send the management operations, it's not central to the example -->
<connection-factory name="ConnectionFactory2">
<connector-ref connector-name="netty-connector2"/>
- <entry name="ConnectionFactory2"/>
+ <entries>
+ <entry name="ConnectionFactory2"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/request-reply/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/request-reply/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/request-reply/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/request-reply/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/scheduled-message/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/scheduled-message/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/scheduled-message/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -5,29 +5,31 @@
<!-- Connectors -->
- <connector name="netty-ssl-connector">
- <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"/>
- <param key="jbm.remoting.netty.keystorepath" value="server0/jbm.example.keystore" type="String"/>
- <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
- </connector>
-
+ <connectors>
+ <connector name="netty-ssl-connector">
+ <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"/>
+ <param key="jbm.remoting.netty.keystorepath" value="server0/jbm.example.keystore" type="String"/>
+ <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
+ </connector>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <acceptor name="netty-ssl-acceptor">
+ <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"/>
+ <param key="jbm.remoting.netty.keystorepath" value="jbm.example.keystore" type="String"/>
+ <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
+ <param key="jbm.remoting.netty.truststorepath" value="jbm.example.truststore" type="String"/>
+ <param key="jbm.remoting.netty.truststorepassword" value="jbmexample" type="String"/>
+ </acceptor>
+ </acceptors>
- <acceptor name="netty-ssl-acceptor">
- <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"/>
- <param key="jbm.remoting.netty.keystorepath" value="jbm.example.keystore" type="String"/>
- <param key="jbm.remoting.netty.keystorepassword" value="jbmexample" type="String"/>
- <param key="jbm.remoting.netty.truststorepath" value="jbm.example.truststore" type="String"/>
- <param key="jbm.remoting.netty.truststorepassword" value="jbmexample" type="String"/>
- </acceptor>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/ssl-enabled/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-ssl-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/temp-queue/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/temp-queue/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/temp-queue/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/temp-queue/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/topic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/topic/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/topic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/topic/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/topic-selector-example1/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/topic-selector-example2/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the topic used by the example-->
Modified: trunk/examples/jms/transactional/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/transactional/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/transactional/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/transactional/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/transactional/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/xa-heuristic/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/xa-receive/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/xa-receive/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/xa-receive/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/xa-receive/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/examples/jms/xa-send/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/xa-send/server0/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,20 +4,21 @@
<configuration>
<!-- Connectors -->
-
- <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>
-
+ <connectors>
+ <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>
+ </connectors>
+
<!-- Acceptors -->
+ <acceptors>
+ <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>
+ </acceptors>
- <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>
-
-
<!-- Other config -->
<journal-min-files>2</journal-min-files>
Modified: trunk/examples/jms/xa-send/server0/jbm-jms.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/examples/jms/xa-send/server0/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,10 +4,12 @@
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty-connector"/>
- <entry name="ConnectionFactory"/>
- <entry name="XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<!--the queue used by the example-->
Modified: trunk/src/config/jbm-cluster-configuration.xml
===================================================================
--- trunk/src/config/jbm-cluster-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/src/config/jbm-cluster-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -51,90 +51,97 @@
-->
<!-- Connectors -->
+ <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-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">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </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-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-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="in-vm">
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
- </connector>
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ </connectors>
<!-- Acceptors -->
+ <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">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" 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>-->
+ </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">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- <param key="jbm.remoting.netty.port" value="${jbm.remoting.netty.port}" 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>-->
-
<!-- Clustering configuration -->
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
- <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>
+ <discovery-groups>
+ <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>
+ </discovery-groups>
- <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>
+ <bridges>
+ <bridge name="foo">
+ <queue-name>toto</queue-name>
+ <forwarding-address>blah</forwarding-address>
+ <filter string="color > 1"/>
+ <connector-ref connector-name="netty"/>
+ </bridge>
+ </bridges>
-<bridge name="foo">
- <queue-name>toto</queue-name>
- <forwarding-address>blah</forwarding-address>
- <filter string="color > 1"/>
- <connector-ref connector-name="netty"/>
-</bridge>
-
<!-- Paging configuration -->
<paging-max-threads>10</paging-max-threads>
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/src/config/jbm-configuration.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -53,95 +53,100 @@
-->
<!-- Connectors -->
+ <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-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">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
+ </connector>
- <connector name="netty">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyConnectorFactory</factory-class>
- </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-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-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="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>
-
+ <connector name="in-vm">
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory</factory-class>
+ </connector>
+ </connectors>
<!-- 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">
- <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
- </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>-->
-
+ <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">
+ <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+ </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>-->
+ </acceptors>
+
<!-- Clustering configuration -->
+ <broadcast-groups>
+ <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>
+ </broadcast-groups>
- <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>
+ <discovery-groups>
+ <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>
+ </discovery-groups>
- <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>
-
<!-- Paging configuration -->
<paging-max-threads>10</paging-max-threads>
Modified: trunk/src/config/jbm-jms.xml
===================================================================
--- trunk/src/config/jbm-jms.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/src/config/jbm-jms.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -4,50 +4,62 @@
<connection-factory name="testConnectionFactory">
<connector-ref connector-name="netty"/>
- <entry name="testConnectionFactory"/>
+ <entries>
+ <entry name="testConnectionFactory"/>
+ </entries>
</connection-factory>
<connection-factory name="ConnectionFactory">
<connector-ref connector-name="netty"/>
- <entry name="ConnectionFactory"/>
- <entry name="/ConnectionFactory"/>
- <entry name="/XAConnectionFactory"/>
- <entry name="java:/ConnectionFactory"/>
- <entry name="java:/XAConnectionFactory"/>
+ <entries>
+ <entry name="ConnectionFactory"/>
+ <entry name="/ConnectionFactory"/>
+ <entry name="/XAConnectionFactory"/>
+ <entry name="java:/ConnectionFactory"/>
+ <entry name="java:/XAConnectionFactory"/>
+ </entries>
</connection-factory>
<connection-factory name="ServerAckConnectionFactory">
<connector-ref connector-name="netty"/>
- <entry name="ServerAckConnectionFactory"/>
- <entry name="/ServerAckConnectionFactory"/>
- <entry name="/ServerAckXAConnectionFactory"/>
- <entry name="java:/ServerAckConnectionFactory"/>
- <entry name="java:/ServerAckXAConnectionFactory"/>
+ <entries>
+ <entry name="ServerAckConnectionFactory"/>
+ <entry name="/ServerAckConnectionFactory"/>
+ <entry name="/ServerAckXAConnectionFactory"/>
+ <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"/>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
+ <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"/>
- <entry name="/ClusteredConnectionFactory"/>
- <entry name="/ClusteredXAConnectionFactory"/>
- <entry name="java:/ClusteredConnectionFactory"/>
- <entry name="java:/ClusteredXAConnectionFactory"/>
+ <entries>
+ <entry name="/ClusteredConnectionFactory"/>
+ <entry name="/ClusteredXAConnectionFactory"/>
+ <entry name="java:/ClusteredConnectionFactory"/>
+ <entry name="java:/ClusteredXAConnectionFactory"/>
+ </entries>
</connection-factory>
<connection-factory name="MyExampleConnectionFactory">
<connector-ref connector-name="netty"/>
- <entry name="/MyExampleConnectionFactory"/>
- <entry name="/acme/MyExampleConnectionFactoryDupe"/>
- <entry name="java:/xyz/CF1"/>
- <entry name="java:/connectionfactories/acme/connection_factory"/>
+ <entries>
+ <entry name="/MyExampleConnectionFactory"/>
+ <entry name="/acme/MyExampleConnectionFactoryDupe"/>
+ <entry name="java:/xyz/CF1"/>
+ <entry name="java:/connectionfactories/acme/connection_factory"/>
+ </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 -->
@@ -80,22 +92,30 @@
<connection-factory name="TestInVMConnectionFactory">
<connector-ref connector-name="in-vm"/>
- <entry name="/TestInVMConnectionFactory"/>
+ <entries>
+ <entry name="/TestInVMConnectionFactory"/>
+ </entries>
</connection-factory>
<connection-factory name="TestSSLConnectionFactory">
<connector-ref connector-name="netty-ssl"/>
- <entry name="/TestSSLConnectionFactory"/>
+ <entries>
+ <entry name="/TestSSLConnectionFactory"/>
+ </entries>
</connection-factory>
<connection-factory name="TestHttpConnectionFactory">
<connector-ref connector-name="netty-http"/>
- <entry name="/TestHttpConnectionFactory"/>
+ <entries>
+ <entry name="/TestHttpConnectionFactory"/>
+ </entries>
</connection-factory>
<connection-factory name="TestServletConnectionFactory">
<connector-ref connector-name="netty-servlet"/>
- <entry name="/TestServletConnectionFactory"/>
+ <entries>
+ <entry name="/TestServletConnectionFactory"/>
+ </entries>
</connection-factory>
<queue name="MyQueue">
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java 2009-04-16 09:24:45 UTC (rev 6443)
@@ -85,6 +85,8 @@
private static final String DISCOVERY_GROUP_ELEMENT = "discovery-group-ref";
+ private static final String ENTRIES_NODE_NAME = "entries";
+
private static final String ENTRY_NODE_NAME = "entry";
private static final String CONNECTION_FACTORY_NODE_NAME = "connection-factory";
@@ -264,11 +266,19 @@
{
failoverOnNodeShutdown = org.jboss.messaging.utils.XMLUtil.parseBoolean(child);;
}
- else if (ENTRY_NODE_NAME.equals(child.getNodeName()))
+ else if (ENTRIES_NODE_NAME.equals(child.getNodeName()))
{
- String jndiName = child.getAttributes().getNamedItem("name").getNodeValue();
-
- jndiBindings.add(jndiName);
+ NodeList entries = child.getChildNodes();
+ for (int i = 0; i < entries.getLength(); i++)
+ {
+ Node entry = entries.item(i);
+ if (ENTRY_NODE_NAME.equals(entry.getNodeName()))
+ {
+ String jndiName = entry.getAttributes().getNamedItem("name").getNodeValue();
+
+ jndiBindings.add(jndiName);
+ }
+ }
}
else if (CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME_ELEMENT.equals(child.getNodeName()))
{
Modified: trunk/src/schemas/jbm-configuration.xsd
===================================================================
--- trunk/src/schemas/jbm-configuration.xsd 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/src/schemas/jbm-configuration.xsd 2009-04-16 09:24:45 UTC (rev 6443)
@@ -21,7 +21,7 @@
<xsd:element name="configuration">
<xsd:complexType>
- <xsd:sequence>
+ <xsd:all>
<xsd:element ref="clustered" maxOccurs="1"
minOccurs="0" />
<xsd:element ref="enable-file-deployment" maxOccurs="1"
@@ -106,30 +106,76 @@
<xsd:element name="backup-connector-ref"
type="backup-connectorType" maxOccurs="1" minOccurs="0">
</xsd:element>
- <xsd:element name="connector" type="connectorType"
- minOccurs="0" maxOccurs="unbounded">
- </xsd:element>
- <xsd:element name="acceptor" type="acceptorType"
- minOccurs="1" maxOccurs="unbounded">
- </xsd:element>
- <xsd:element ref="broadcast-group" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- <xsd:element ref="discovery-group" maxOccurs="unbounded"
- minOccurs="0">
- </xsd:element>
- <xsd:element name="divert" type="divertType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- <xsd:element name="queue" type="queueType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- <xsd:element name="bridge" type="bridgeType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
- <xsd:element name="cluster-connection" type="clusterConnectionType"
- maxOccurs="unbounded" minOccurs="0">
- </xsd:element>
+ <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector" type="connectorType" maxOccurs="unbounded" minOccurs="0"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="acceptors" maxOccurs="1" minOccurs="1">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="acceptor" type="acceptorType"
+ minOccurs="1" maxOccurs="unbounded">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="broadcast-groups" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="broadcast-group" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="discovery-groups" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="discovery-group" maxOccurs="unbounded"
+ minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="diverts" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="divert" type="divertType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="queues" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="queue" type="queueType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="bridges" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="bridge" type="bridgeType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="cluster-connections" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="cluster-connection" type="clusterConnectionType"
+ maxOccurs="unbounded" minOccurs="0">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="paging-max-threads" type="xsd:positiveInteger"
maxOccurs="1" minOccurs="0">
</xsd:element>
@@ -179,7 +225,7 @@
type="xsd:string" maxOccurs="1" minOccurs="0">
</xsd:element>
- </xsd:sequence>
+ </xsd:all>
</xsd:complexType>
</xsd:element>
Modified: trunk/src/schemas/jbm-jms.xsd
===================================================================
--- trunk/src/schemas/jbm-jms.xsd 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/src/schemas/jbm-jms.xsd 2009-04-16 09:24:45 UTC (rev 6443)
@@ -25,16 +25,18 @@
<xsd:element name="connection-factory">
<xsd:complexType>
- <xsd:sequence>
- <xsd:choice>
- <xsd:element ref="connector-ref" maxOccurs="1"
- minOccurs="1">
- </xsd:element>
- <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="1"></xsd:element>
- </xsd:choice>
- <xsd:element name="entry" type="entryType"
- maxOccurs="unbounded" minOccurs="1">
- </xsd:element>
+ <xsd:all>
+ <xsd:element name="connector-ref" type="connector-refType" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="entries" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="entry" type="entryType"
+ maxOccurs="unbounded" minOccurs="1">
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="ping-period" type="xsd:unsignedLong"
maxOccurs="1" minOccurs="0">
</xsd:element>
@@ -104,13 +106,11 @@
<xsd:element name="discovery-initial-wait" type="xsd:unsignedLong"
maxOccurs="1" minOccurs="0">
</xsd:element>
- </xsd:sequence>
+ </xsd:all>
<xsd:attribute name="name" type="xsd:string"></xsd:attribute>
</xsd:complexType>
</xsd:element>
- <xsd:element name="connector-ref" type="connector-refType"></xsd:element>
-
<xsd:complexType name="connector-refType">
<xsd:attribute name="connector-name" type="xsd:string" use="required"></xsd:attribute>
<xsd:attribute name="backup-connector-name" type="xsd:string" use="optional"></xsd:attribute>
Modified: trunk/src/schemas/jbm-queues.xsd
===================================================================
--- trunk/src/schemas/jbm-queues.xsd 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/src/schemas/jbm-queues.xsd 2009-04-16 09:24:45 UTC (rev 6443)
@@ -42,7 +42,7 @@
<xsd:element name="address-settings" type="address-settingsType"></xsd:element>
<xsd:complexType name="address-settingsType">
- <xsd:sequence>
+ <xsd:all>
<xsd:element name="clustered" type="xsd:boolean"
maxOccurs="1" minOccurs="0">
</xsd:element>
@@ -79,7 +79,7 @@
<xsd:element name="redistribution-delay" type="xsd:unsignedLong"
maxOccurs="1" minOccurs="0">
</xsd:element>
- </xsd:sequence>
+ </xsd:all>
<xsd:attribute name="match" type="xsd:string" use="required"></xsd:attribute>
</xsd:complexType>
Modified: trunk/tests/config/ConfigurationTest-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-config.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/tests/config/ConfigurationTest-config.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -20,27 +20,32 @@
<queue-activation-timeout>12456</queue-activation-timeout>
<backup>true</backup>
<backup-connector-ref connector-name="backup-connector"/>
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
- <param key="c_mykey1" value="c_foovalue1" type="String"/>
- <param key="c_mykey2" value="6000" type="Long"/>
- <param key="c_mykey3" value="60" type="Integer"/>
- <param key="c_mykey4" value="c_foovalue4" type="String"/>
- </connector>
- <acceptor>
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
- <param key="a_mykey1" value="a_foovalue1" type="String"/>
- <param key="a_mykey2" value="1234567" type="Long"/>
- <param key="a_mykey3" value="123" type="Integer"/>
- <param key="a_mykey4" value="a_foovalue4" type="String"/>
- </acceptor>
- <acceptor>
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
- <param key="b_mykey1" value="b_foovalue1" type="String"/>
- <param key="b_mykey2" value="7654321" type="Long"/>
- <param key="b_mykey3" value="321" type="Integer"/>
- <param key="b_mykey4" value="b_foovalue4" type="String"/>
- </acceptor>
+ <connectors>
+ <connector name="backup-connector">
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
+ <param key="c_mykey1" value="c_foovalue1" type="String"/>
+ <param key="c_mykey2" value="6000" type="Long"/>
+ <param key="c_mykey3" value="60" type="Integer"/>
+ <param key="c_mykey4" value="c_foovalue4" type="String"/>
+ </connector>
+ </connectors>
+ <acceptors>
+ <acceptor>
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
+ <param key="a_mykey1" value="a_foovalue1" type="String"/>
+ <param key="a_mykey2" value="1234567" type="Long"/>
+ <param key="a_mykey3" value="123" type="Integer"/>
+ <param key="a_mykey4" value="a_foovalue4" type="String"/>
+ </acceptor>
+ <acceptor>
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
+ <param key="b_mykey1" value="b_foovalue1" type="String"/>
+ <param key="b_mykey2" value="7654321" type="Long"/>
+ <param key="b_mykey3" value="321" type="Integer"/>
+ <param key="b_mykey4" value="b_foovalue4" type="String"/>
+ </acceptor>
+ </acceptors>
+
<bindings-directory>somedir</bindings-directory>
<create-bindings-dir>false</create-bindings-dir>
<journal-directory>somedir2</journal-directory>
Modified: trunk/tests/config/ConfigurationTest-defaults.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-defaults.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/tests/config/ConfigurationTest-defaults.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -2,8 +2,10 @@
<configuration>
<!-- just use all the defaults -->
<!-- we must declare at least one acceptor to have a valid configuration -->
- <acceptor>
- <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
- </acceptor>
+ <acceptors>
+ <acceptor>
+ <factory-class>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</factory-class>
+ </acceptor>
+ </acceptors>
</configuration>
</deployment>
\ No newline at end of file
Modified: trunk/tests/config/ConfigurationTest-full-config.xml
===================================================================
--- trunk/tests/config/ConfigurationTest-full-config.xml 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/tests/config/ConfigurationTest-full-config.xml 2009-04-16 09:24:45 UTC (rev 6443)
@@ -25,127 +25,143 @@
<queue-activation-timeout>12456</queue-activation-timeout>
<backup>true</backup>
<persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>
- <backup-connector-ref connector-name="backup-connector"/>
- <connector name="connector">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
- <param key="d_mykey1" value="d_foovalue1" type="String"/>
- <param key="d_mykey2" value="6000" type="Long"/>
- <param key="d_mykey3" value="60" type="Integer"/>
- <param key="d_mykey4" value="d_foovalue4" type="String"/>
- </connector>
- <connector name="connector1">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
- <param key="d_mykey1" value="d_foovalue1" type="String"/>
- <param key="d_mykey2" value="6000" type="Long"/>
- <param key="d_mykey3" value="60" type="Integer"/>
- <param key="d_mykey4" value="d_foovalue4" type="String"/>
- </connector>
- <connector name="connector2">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory3</factory-class>
- <param key="d_mykey1" value="d_foovalue1" type="String"/>
- <param key="d_mykey2" value="6000" type="Long"/>
- <param key="d_mykey3" value="60" type="Integer"/>
- <param key="d_mykey4" value="d_foovalue4" type="String"/>
- </connector>
- <connector name="backup-connector">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
- <param key="c_mykey1" value="c_foovalue1" type="String"/>
- <param key="c_mykey2" value="6000" type="Long"/>
- <param key="c_mykey3" value="60" type="Integer"/>
- <param key="c_mykey4" value="c_foovalue4" type="String"/>
- </connector>
- <acceptor name="acceptor1">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
- <param key="a_mykey1" value="a_foovalue1" type="String"/>
- <param key="a_mykey2" value="1234567" type="Long"/>
- <param key="a_mykey3" value="123" type="Integer"/>
- <param key="a_mykey4" value="a_foovalue4" type="String"/>
- </acceptor>
- <acceptor name="acceptor2">
- <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
- <param key="b_mykey1" value="b_foovalue1" type="String"/>
- <param key="b_mykey2" value="7654321" type="Long"/>
- <param key="b_mykey3" value="321" type="Integer"/>
- <param key="b_mykey4" value="b_foovalue4" type="String"/>
- </acceptor>
- <broadcast-group name="bg1">
- <local-bind-port>10999</local-bind-port>
- <group-address>192.168.0.120</group-address>
- <group-port>11999</group-port>
- <broadcast-period>12345</broadcast-period>
- <connector-ref connector-name="connector"/>
- </broadcast-group>
- <broadcast-group name="bg2">
- <local-bind-port>10999</local-bind-port>
- <group-address>192.168.0.120</group-address>
- <group-port>11999</group-port>
- <broadcast-period>12345</broadcast-period>
- <connector-ref connector-name="connector"/>
- </broadcast-group>
- <discovery-group name="dg1">
- <group-address>192.168.0.121</group-address>
- <group-port>11999</group-port>
- <refresh-timeout>12345</refresh-timeout>
- </discovery-group>
- <discovery-group name="dg2">
- <group-address>192.168.0.121</group-address>
- <group-port>11999</group-port>
- <refresh-timeout>12345</refresh-timeout>
- </discovery-group>
- <divert name="divert1">
- <routing-name>routing-name1</routing-name>
- <address>address1</address>
- <forwarding-address>forwarding-addres1</forwarding-address>
- <filter string="speed > 88"/>
- <transformer-class-name>org.foo.Transformer</transformer-class-name>
- <exclusive>true</exclusive>
- </divert>
- <divert name="divert2">
- <routing-name>routing-name2</routing-name>
- <address>address2</address>
- <forwarding-address>forwarding-addres2</forwarding-address>
- <filter string="speed > 88"/>
- <transformer-class-name>org.foo.Transformer</transformer-class-name>
- <exclusive>false</exclusive>
- </divert>
- <queue name="foo" address="bar" filter="color = 'red'" durable="false" />
- <queue name="foo2" address="bar2" filter="color = 'red'" durable="false" />
- <bridge name="bridge">
- <queue-name>foo</queue-name>
- <forwarding-address>bridge-forwarding-address</forwarding-address>
- <filter string="sku > 1"/>
- <transformer-class-name>org.foo.BridgeTransformer</transformer-class-name>
- <retry-interval>3</retry-interval>
- <retry-interval-multiplier>0.2</retry-interval-multiplier>
- <reconnect-attempts>2</reconnect-attempts>
- <failover-on-server-shutdown>false</failover-on-server-shutdown>
- <use-duplicate-detection>true</use-duplicate-detection>
- <connector-ref connector-name="connector"/>
- </bridge>
- <bridge name="bridge2">
- <queue-name>foo2</queue-name>
- <forwarding-address>bridge-forwarding-address</forwarding-address>
- <filter string="sku > 1"/>
- <disccovery-group-ref discovery-group-name="dg1"/>
- </bridge>
- <cluster-connection name="cluster-connection1">
- <address>queues</address>
- <retry-interval>3</retry-interval>
- <use-duplicate-detection>true</use-duplicate-detection>
- <forward-when-no-consumers>true</forward-when-no-consumers>
- <max-hops>1</max-hops>
- <connector-ref connector-name="connector"/>
- <connector-ref connector-name="connector1"/>
- <connector-ref connector-name="connector2"/>
- </cluster-connection>
- <cluster-connection name="cluster-connection2">
- <address>queues2</address>
- <retry-interval>3</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="dg1"/>
- </cluster-connection>
+ <backup-connector-ref connector-name="backup-connector" />
+ <connectors>
+ <connector name="connector">
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
+ <param key="d_mykey1" value="d_foovalue1" type="String"/>
+ <param key="d_mykey2" value="6000" type="Long"/>
+ <param key="d_mykey3" value="60" type="Integer"/>
+ <param key="d_mykey4" value="d_foovalue4" type="String"/>
+ </connector>
+ <connector name="connector1">
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory2</factory-class>
+ <param key="d_mykey1" value="d_foovalue1" type="String"/>
+ <param key="d_mykey2" value="6000" type="Long"/>
+ <param key="d_mykey3" value="60" type="Integer"/>
+ <param key="d_mykey4" value="d_foovalue4" type="String"/>
+ </connector>
+ <connector name="connector2">
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory3</factory-class>
+ <param key="d_mykey1" value="d_foovalue1" type="String"/>
+ <param key="d_mykey2" value="6000" type="Long"/>
+ <param key="d_mykey3" value="60" type="Integer"/>
+ <param key="d_mykey4" value="d_foovalue4" type="String"/>
+ </connector>
+ <connector name="backup-connector">
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestConnectorFactory1</factory-class>
+ <param key="c_mykey1" value="c_foovalue1" type="String"/>
+ <param key="c_mykey2" value="6000" type="Long"/>
+ <param key="c_mykey3" value="60" type="Integer"/>
+ <param key="c_mykey4" value="c_foovalue4" type="String"/>
+ </connector>
+ </connectors>
+ <acceptors>
+ <acceptor name="acceptor1">
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory1</factory-class>
+ <param key="a_mykey1" value="a_foovalue1" type="String"/>
+ <param key="a_mykey2" value="1234567" type="Long"/>
+ <param key="a_mykey3" value="123" type="Integer"/>
+ <param key="a_mykey4" value="a_foovalue4" type="String"/>
+ </acceptor>
+ <acceptor name="acceptor2">
+ <factory-class>org.jboss.messaging.tests.unit.core.config.impl.TestAcceptorFactory2</factory-class>
+ <param key="b_mykey1" value="b_foovalue1" type="String"/>
+ <param key="b_mykey2" value="7654321" type="Long"/>
+ <param key="b_mykey3" value="321" type="Integer"/>
+ <param key="b_mykey4" value="b_foovalue4" type="String"/>
+ </acceptor>
+ </acceptors>
+ <broadcast-groups>
+ <broadcast-group name="bg1">
+ <local-bind-port>10999</local-bind-port>
+ <group-address>192.168.0.120</group-address>
+ <group-port>11999</group-port>
+ <broadcast-period>12345</broadcast-period>
+ <connector-ref connector-name="connector"/>
+ </broadcast-group>
+ <broadcast-group name="bg2">
+ <local-bind-port>10999</local-bind-port>
+ <group-address>192.168.0.120</group-address>
+ <group-port>11999</group-port>
+ <broadcast-period>12345</broadcast-period>
+ <connector-ref connector-name="connector"/>
+ </broadcast-group>
+ </broadcast-groups>
+ <discovery-groups>
+ <discovery-group name="dg1">
+ <group-address>192.168.0.121</group-address>
+ <group-port>11999</group-port>
+ <refresh-timeout>12345</refresh-timeout>
+ </discovery-group>
+ <discovery-group name="dg2">
+ <group-address>192.168.0.121</group-address>
+ <group-port>11999</group-port>
+ <refresh-timeout>12345</refresh-timeout>
+ </discovery-group>
+ </discovery-groups>
+ <diverts>
+ <divert name="divert1">
+ <routing-name>routing-name1</routing-name>
+ <address>address1</address>
+ <forwarding-address>forwarding-addres1</forwarding-address>
+ <filter string="speed > 88"/>
+ <transformer-class-name>org.foo.Transformer</transformer-class-name>
+ <exclusive>true</exclusive>
+ </divert>
+ <divert name="divert2">
+ <routing-name>routing-name2</routing-name>
+ <address>address2</address>
+ <forwarding-address>forwarding-addres2</forwarding-address>
+ <filter string="speed > 88"/>
+ <transformer-class-name>org.foo.Transformer</transformer-class-name>
+ <exclusive>false</exclusive>
+ </divert>
+ </diverts>
+ <queues>
+ <queue name="foo" address="bar" filter="color = 'red'" durable="false" />
+ <queue name="foo2" address="bar2" filter="color = 'red'" durable="false" />
+ </queues>
+ <bridges>
+ <bridge name="bridge">
+ <queue-name>foo</queue-name>
+ <forwarding-address>bridge-forwarding-address</forwarding-address>
+ <filter string="sku > 1"/>
+ <transformer-class-name>org.foo.BridgeTransformer</transformer-class-name>
+ <retry-interval>3</retry-interval>
+ <retry-interval-multiplier>0.2</retry-interval-multiplier>
+ <reconnect-attempts>2</reconnect-attempts>
+ <failover-on-server-shutdown>false</failover-on-server-shutdown>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <connector-ref connector-name="connector"/>
+ </bridge>
+ <bridge name="bridge2">
+ <queue-name>foo2</queue-name>
+ <forwarding-address>bridge-forwarding-address</forwarding-address>
+ <filter string="sku > 1"/>
+ <disccovery-group-ref discovery-group-name="dg1"/>
+ </bridge>
+ </bridges>
+ <cluster-connections>
+ <cluster-connection name="cluster-connection1">
+ <address>queues</address>
+ <retry-interval>3</retry-interval>
+ <use-duplicate-detection>true</use-duplicate-detection>
+ <forward-when-no-consumers>true</forward-when-no-consumers>
+ <max-hops>1</max-hops>
+ <connector-ref connector-name="connector"/>
+ <connector-ref connector-name="connector1"/>
+ <connector-ref connector-name="connector2"/>
+ </cluster-connection>
+ <cluster-connection name="cluster-connection2">
+ <address>queues2</address>
+ <retry-interval>3</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="dg1"/>
+ </cluster-connection>
+ </cluster-connections>
<paging-max-threads>2</paging-max-threads>
<paging-directory>pagingdir</paging-directory>
<paging-global-watermark-size>123</paging-global-watermark-size>
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/ConfigurationValidationTest.java 2009-04-16 09:24:45 UTC (rev 6443)
@@ -66,7 +66,9 @@
}
xml = "<deployment xmlns='urn:jboss:messaging'> " + "<configuration>"
+ + "<acceptors>"
+ "<acceptor><factory-class>FooAcceptor</factory-class></acceptor>"
+ + "</acceptors>"
+ "</configuration>"
+ "</deployment>";
element = XMLUtil.stringToElement(xml);
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java 2009-04-16 07:58:56 UTC (rev 6442)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/config/impl/QueueDeployerTest.java 2009-04-16 09:24:45 UTC (rev 6443)
@@ -81,8 +81,12 @@
String xml = "<deployment xmlns='urn:jboss:messaging'> "
+ "<configuration>"
+ + "<acceptors>"
+ "<acceptor><factory-class>FooAcceptor</factory-class></acceptor>"
+ + "</acceptors>"
+ + "<queues>"
+ "<queue name='foo' address='bar' filter='speed > 88' durable='false' />"
+ + "</queues>"
+ "</configuration>"
+ "<settings>"
+ "<queue name='foo2' address='bar2' filter='speed > 88' durable='true' />"
More information about the jboss-cvs-commits
mailing list