[hornetq-commits] JBoss hornetq SVN: r8323 - in trunk: examples/common and 94 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Nov 19 10:59:34 EST 2009
Author: jmesnil
Date: 2009-11-19 10:59:30 -0500 (Thu, 19 Nov 2009)
New Revision: 8323
Modified:
trunk/docs/user-manual/en/client-reconnection.xml
trunk/docs/user-manual/en/clusters.xml
trunk/docs/user-manual/en/configuration-index.xml
trunk/docs/user-manual/en/configuring-transports.xml
trunk/docs/user-manual/en/flow-control.xml
trunk/docs/user-manual/en/large-messages.xml
trunk/docs/user-manual/en/message-grouping.xml
trunk/docs/user-manual/en/pre-acknowledge.xml
trunk/docs/user-manual/en/thread-pooling.xml
trunk/docs/user-manual/en/using-jms.xml
trunk/examples/common/build.xml
trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml
trunk/examples/javaee/hajndi/config/hornetq-jms.xml
trunk/examples/javaee/jca-config/server/hornetq-jms.xml
trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml
trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml
trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml
trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml
trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml
trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml
trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml
trunk/examples/javaee/xarecovery/server/hornetq-jms.xml
trunk/examples/jms/applet/server0/hornetq-jms.xml
trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml
trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml
trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml
trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml
trunk/examples/jms/bridge/server0/hornetq-jms.xml
trunk/examples/jms/bridge/server1/hornetq-jms.xml
trunk/examples/jms/browser/server0/hornetq-jms.xml
trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml
trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml
trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml
trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml
trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml
trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml
trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml
trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml
trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml
trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml
trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml
trunk/examples/jms/dead-letter/server0/hornetq-jms.xml
trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml
trunk/examples/jms/divert/server0/hornetq-jms.xml
trunk/examples/jms/divert/server1/hornetq-jms.xml
trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml
trunk/examples/jms/expiry/server0/hornetq-jms.xml
trunk/examples/jms/http-transport/server0/hornetq-jms.xml
trunk/examples/jms/interceptor/server0/hornetq-jms.xml
trunk/examples/jms/jaas/server0/hornetq-jms.xml
trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml
trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml
trunk/examples/jms/jmx/server0/hornetq-jms.xml
trunk/examples/jms/large-message/server0/hornetq-jms.xml
trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml
trunk/examples/jms/management-notifications/server0/hornetq-jms.xml
trunk/examples/jms/management/server0/hornetq-jms.xml
trunk/examples/jms/message-counters/server0/hornetq-jms.xml
trunk/examples/jms/message-group/server0/hornetq-jms.xml
trunk/examples/jms/message-priority/server0/hornetq-jms.xml
trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml
trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml
trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml
trunk/examples/jms/paging/server0/hornetq-jms.xml
trunk/examples/jms/perf/server0/hornetq-jms.xml
trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml
trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml
trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml
trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml
trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml
trunk/examples/jms/queue-selector/server0/hornetq-jms.xml
trunk/examples/jms/queue/server0/hornetq-jms.xml
trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml
trunk/examples/jms/request-reply/server0/hornetq-jms.xml
trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml
trunk/examples/jms/security/server0/hornetq-jms.xml
trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml
trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml
trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml
trunk/examples/jms/static-selector/server0/hornetq-jms.xml
trunk/examples/jms/temp-queue/server0/hornetq-jms.xml
trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml
trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml
trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml
trunk/examples/jms/topic/server0/hornetq-jms.xml
trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml
trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml
trunk/examples/jms/transactional/server0/hornetq-jms.xml
trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml
trunk/examples/jms/xa-receive/server0/hornetq-jms.xml
trunk/examples/jms/xa-send/server0/hornetq-jms.xml
trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml
trunk/examples/soak/normal/server0/hornetq-jms.xml
trunk/src/config/common/schema/hornetq-jms.xsd
trunk/src/config/jboss-as/clustered/hornetq-jms.xml
trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
trunk/src/config/stand-alone/clustered/hornetq-jms.xml
trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
trunk/src/config/trunk/clustered/hornetq-jms.xml
trunk/src/config/trunk/non-clustered/hornetq-jms.xml
trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
trunk/tests/jms-tests/config/hornetq-jms.xml
Log:
HORNETQ-222: XSD schema does not allow to configure multiple connector pairs for JMS Connection Factory
* added a <connectors> container to allow multiple <connector-ref>
* updated doc + examples
Modified: trunk/docs/user-manual/en/client-reconnection.xml
===================================================================
--- trunk/docs/user-manual/en/client-reconnection.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/client-reconnection.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -86,7 +86,9 @@
the xml configuration in <literal>hornetq-jms.xml</literal>, for example:</para>
<programlisting>
<connection-factory name="ConnectionFactory">
-<connector-ref connector-name="netty"/>
+<connectors>
+ <connector-ref connector-name="netty"/>
+</connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/clusters.xml
===================================================================
--- trunk/docs/user-manual/en/clusters.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/clusters.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -501,12 +501,14 @@
specify the list of servers in the server side configuration file <literal
>hornetq-jms.xml</literal>. Let's take a look at an example:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="my-connector1"
- backup-connector-name="my-backup-connector1"/>
- <connector-ref connector-name="my-connector2"
- backup-connector-name="my-backup-connector2"/>
- <connector-ref connector-name="my-connector3"
- backup-connector-name="my-backup-connector3"/>
+ <connectors>
+ <connector-ref connector-name="my-connector1"
+ backup-connector-name="my-backup-connector1"/>
+ <connector-ref connector-name="my-connector2"
+ backup-connector-name="my-backup-connector2"/>
+ <connector-ref connector-name="my-connector3"
+ backup-connector-name="my-backup-connector3"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/configuration-index.xml
===================================================================
--- trunk/docs/user-manual/en/configuration-index.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/configuration-index.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -839,14 +839,21 @@
</row>
<row>
<entry><link linkend="clusters.static.servers"
- >connection-factory.connector-ref.connector-name (attribute)</link></entry>
+ >connection-factory.connectors</link></entry>
<entry>String</entry>
+ <entry>A list of connectors used bu the connection factory</entry>
+ <entry />
+ </row>
+ <row>
+ <entry><link linkend="clusters.static.servers"
+ >connection-factory.connectors.connector-ref.connector-name (attribute)</link></entry>
+ <entry>String</entry>
<entry>Name of the connector to connect to the live server</entry>
<entry />
</row>
<row>
<entry><link linkend="clusters.static.servers"
- >connection-factory.connector-ref.backup-connector-name (attribute)</link></entry>
+ >connection-factory.connectors.connector-ref.backup-connector-name (attribute)</link></entry>
<entry>String</entry>
<entry>Name of the connector to connect to the backup server</entry>
<entry />
Modified: trunk/docs/user-manual/en/configuring-transports.xml
===================================================================
--- trunk/docs/user-manual/en/configuring-transports.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/configuring-transports.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -102,7 +102,9 @@
>hornetq-configuration.xml</literal> file:</para>
<programlisting>
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/flow-control.xml
===================================================================
--- trunk/docs/user-manual/en/flow-control.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/flow-control.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -109,7 +109,9 @@
configured in <literal>hornetq-jms.xml</literal>:</para>
<programlisting>
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
@@ -149,7 +151,9 @@
<para>If JNDI is used to look up the connection factory, the max rate can be configured
in <literal>hornetq-jms.xml</literal>:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
@@ -207,7 +211,9 @@
<para>If JNDI is used to look up the connection factory, the max rate can be configured
in <literal>hornetq-jms.xml</literal>:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/large-messages.xml
===================================================================
--- trunk/docs/user-manual/en/large-messages.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/large-messages.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -78,7 +78,9 @@
is specified in <literal>hornetq-jms.xml</literal></para>
<programlisting>...
<connection-factory name="ConnectionFactory">
-<connector-ref connector-name="netty"/>
+<connectors>
+ <connector-ref connector-name="netty"/>
+</connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/message-grouping.xml
===================================================================
--- trunk/docs/user-manual/en/message-grouping.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/message-grouping.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -63,7 +63,9 @@
>HornetQConnectonFactory</literal> which will pick a random unique id. This can also be
set in the <literal>hornetq-jms.xml</literal> file like this:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/pre-acknowledge.xml
===================================================================
--- trunk/docs/user-manual/en/pre-acknowledge.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/pre-acknowledge.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -54,7 +54,9 @@
<para>This can be configured in the <literal>hornetq-jms.xml</literal> file on the <literal
>connection factory</literal> like this:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/docs/user-manual/en/thread-pooling.xml
===================================================================
--- trunk/docs/user-manual/en/thread-pooling.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/thread-pooling.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -113,7 +113,9 @@
instances, you can also set these parameters in the <literal>hornetq-jms.xml</literal>
file where you describe your connection factory, for example:</para>
<programlisting><connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/docs/user-manual/en/using-jms.xml
===================================================================
--- trunk/docs/user-manual/en/using-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/docs/user-manual/en/using-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -63,7 +63,9 @@
xsi:schemaLocation="urn:hornetq ../schemas/hornetq-jms.xsd ">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/common/build.xml
===================================================================
--- trunk/examples/common/build.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/common/build.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -201,6 +201,7 @@
<exclude name="jms/applet/build.xml"/>
<exclude name="jms/clustered-standalone/build.xml"/>
<exclude name="jms/jms-bridge/build.xml"/>
+ <exclude name="jms/large-message/build.xml"/>
<exclude name="jms/perf/build.xml"/>
</fileset>
</subant>
Modified: trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/ejb-jms-transaction/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/hajndi/config/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/hajndi/config/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/hajndi/config/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/jca-config/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/jca-config/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/jca-config/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -2,7 +2,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/jms-bridge/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-bmt/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-setrollbackonly/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-tx-local/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-tx-not-supported/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-cmt-tx-required/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-message-selector/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/mdb-tx-send/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/servlet-ssl/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
+ <connectors>
+ <connector-ref connector-name="netty-servlet"/>
+ </connectors>
<entries>
<entry name="/ServletConnectionFactory"/>
</entries>
Modified: trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/servlet-transport/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ServletConnectionFactory">
- <connector-ref connector-name="netty-servlet"/>
+ <connectors>
+ <connector-ref connector-name="netty-servlet"/>
+ </connectors>
<entries>
<entry name="/ServletConnectionFactory"/>
</entries>
Modified: trunk/examples/javaee/xarecovery/server/hornetq-jms.xml
===================================================================
--- trunk/examples/javaee/xarecovery/server/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/javaee/xarecovery/server/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/examples/jms/applet/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/applet/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/applet/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/application-layer-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/application-layer-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/automatic-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/automatic-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/bridge/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/bridge/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/bridge/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/bridge/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/bridge/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/browser/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/browser/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/browser/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/client-kickoff/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-grouping/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-grouping/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-grouping/server2/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-queue/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-topic/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/clustered-topic/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/dead-letter/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/dead-letter/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/dead-letter/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/delayed-redelivery/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/divert/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/divert/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/divert/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -5,7 +5,9 @@
<!-- the connection factory used by the example -->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/divert/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/divert/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/divert/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -5,7 +5,9 @@
<!-- the connection factory used by the example -->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/durable-subscription/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/expiry/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/expiry/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/expiry/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/http-transport/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/http-transport/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/http-transport/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/interceptor/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/interceptor/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/interceptor/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jaas/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jaas/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jaas/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jms-bridge/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/source/ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jms-bridge/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/target/ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/jmx/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/jmx/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/jmx/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/large-message/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/large-message/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/large-message/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<min-large-message-size>10240</min-large-message-size>
<entries>
<entry name="ConnectionFactory"/>
Modified: trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/last-value-queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/management/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/management/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/management/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/management-notifications/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/management-notifications/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/management-notifications/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/message-counters/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/message-counters/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/message-counters/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/message-group/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/message-group/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/message-group/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/message-priority/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/message-priority/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/message-priority/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/non-transaction-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/non-transaction-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
Modified: trunk/examples/jms/paging/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/paging/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/paging/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/perf/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/perf/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/perf/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/pre-acknowledge/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/producer-rate-limit/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-requestor/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/queue-selector/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/queue-selector/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/queue-selector/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/reconnect-same-node/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -5,7 +5,9 @@
<!--the connection factories used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/request-reply/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/request-reply/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/request-reply/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/scheduled-message/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/security/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/security/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/security/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<block-on-persistent-send>true</block-on-persistent-send>
<block-on-non-persistent-send>true</block-on-non-persistent-send>
<entries>
Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/send-acknowledgements/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/ssl-enabled/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-ssl-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-ssl-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/static-selector/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/static-selector/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/static-selector/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/static-selector-jms/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/temp-queue/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/temp-queue/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/temp-queue/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic-hierarchies/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic-selector-example1/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/topic-selector-example2/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/transaction-failover/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,8 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
-
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/transaction-failover/server1/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,8 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
-
+ <connectors>
+ <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/transactional/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/transactional/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/transactional/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-heuristic/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-receive/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-receive/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-receive/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-send/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-send/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-send/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/jms/xa-with-jta/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="XAConnectionFactory"/>
</entries>
Modified: trunk/examples/soak/normal/server0/hornetq-jms.xml
===================================================================
--- trunk/examples/soak/normal/server0/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/examples/soak/normal/server0/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<!--the connection factory used by the example-->
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty-connector"/>
+ <connectors>
+ <connector-ref connector-name="netty-connector"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
</entries>
Modified: trunk/src/config/common/schema/hornetq-jms.xsd
===================================================================
--- trunk/src/config/common/schema/hornetq-jms.xsd 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/common/schema/hornetq-jms.xsd 2009-11-19 15:59:30 UTC (rev 8323)
@@ -30,6 +30,14 @@
<xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element>
<xsd:element name="discovery-initial-wait-timeout" type="xsd:long" maxOccurs="1" minOccurs="0"></xsd:element>
+ <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector-ref" type="connector-refType"
+ maxOccurs="unbounded" minOccurs="1"></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="entries" maxOccurs="1" minOccurs="0">
<xsd:complexType>
<xsd:sequence>
Modified: trunk/src/config/jboss-as/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/jboss-as/clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/jboss-as/non-clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/ConnectionFactory"/>
<entry name="/XAConnectionFactory"/>
Modified: trunk/src/config/stand-alone/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/stand-alone/clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/ConnectionFactory"/>
<entry name="/XAConnectionFactory"/>
Modified: trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/stand-alone/non-clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="NettyConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="/ConnectionFactory"/>
<entry name="/XAConnectionFactory"/>
Modified: trunk/src/config/trunk/clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/trunk/clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/trunk/clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/src/config/trunk/non-clustered/hornetq-jms.xml
===================================================================
--- trunk/src/config/trunk/non-clustered/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/config/trunk/non-clustered/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="XAConnectionFactory"/>
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-11-19 15:59:30 UTC (rev 8323)
@@ -62,6 +62,8 @@
private static final String ENTRY_NODE_NAME = "entry";
+ private static final String CONNECTORS_NODE_NAME = "connectors";
+
private static final String CONNECTION_FACTORY_NODE_NAME = "connection-factory";
private static final String QUEUE_NODE_NAME = "queue";
@@ -177,38 +179,40 @@
}
}
}
- else if (CONNECTOR_REF_ELEMENT.equals(child.getNodeName()))
+ else if (CONNECTORS_NODE_NAME.equals(child.getNodeName()))
{
- String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue();
-
- TransportConfiguration connector = configuration.getConnectorConfigurations().get(connectorName);
-
- if (connector == null)
+ NodeList entries = child.getChildNodes();
+ for (int i = 0; i < entries.getLength(); i++)
{
- log.warn("There is no connector with name '" + connectorName + "' deployed.");
+ Node entry = entries.item(i);
+ if (CONNECTOR_REF_ELEMENT.equals(entry.getNodeName()))
+ {
+ String connectorName = entry.getAttributes().getNamedItem("connector-name").getNodeValue();
+ TransportConfiguration connector = configuration.getConnectorConfigurations().get(connectorName);
- return;
- }
+ if (connector == null)
+ {
+ log.warn("There is no connector with name '" + connectorName + "' deployed.");
+ return;
+ }
- TransportConfiguration backupConnector = null;
+ TransportConfiguration backupConnector = null;
+ Node backupNode = entry.getAttributes().getNamedItem("backup-connector-name");
+ if (backupNode != null)
+ {
+ String backupConnectorName = backupNode.getNodeValue();
+ backupConnector = configuration.getConnectorConfigurations().get(backupConnectorName);
- Node backupNode = child.getAttributes().getNamedItem("backup-connector-name");
+ if (backupConnector == null)
+ {
+ log.warn("There is no backup connector with name '" + connectorName + "' deployed.");
+ return;
+ }
+ }
- if (backupNode != null)
- {
- String backupConnectorName = backupNode.getNodeValue();
-
- backupConnector = configuration.getConnectorConfigurations().get(backupConnectorName);
-
- if (backupConnector == null)
- {
- log.warn("There is no backup connector with name '" + connectorName + "' deployed.");
-
- return;
+ connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(connector, backupConnector));
}
}
-
- connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(connector, backupConnector));
}
else if (DISCOVERY_GROUP_ELEMENT.equals(child.getNodeName()))
{
Modified: trunk/tests/jms-tests/config/hornetq-jms.xml
===================================================================
--- trunk/tests/jms-tests/config/hornetq-jms.xml 2009-11-19 12:54:45 UTC (rev 8322)
+++ trunk/tests/jms-tests/config/hornetq-jms.xml 2009-11-19 15:59:30 UTC (rev 8323)
@@ -3,7 +3,9 @@
xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
<connection-factory name="ConnectionFactory">
- <connector-ref connector-name="netty"/>
+ <connectors>
+ <connector-ref connector-name="netty"/>
+ </connectors>
<entries>
<entry name="ConnectionFactory"/>
<entry name="/ConnectionFactory"/>
More information about the hornetq-commits
mailing list