Author: jmesnil Date: 2010-07-19 11:46:30 -0400 (Mon, 19 Jul 2010) New Revision: 9422 Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/readme.html branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server0/ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server0/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server1/ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server1/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server2/ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server2/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/readme.html branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server0/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server1/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/message-group2/ branches/2_2_0_HA_Improvements/examples/jms/message-group2/server0/ branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server0/hornetq-configuration.xml branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server1/hornetq-configuration.xml Log: HA refactoring * fix JMS examples' server configuration (but the examples still fail) Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -26,7 +26,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -41,6 +41,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-durable-subscription/server1/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -26,7 +26,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -41,6 +41,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Property changes on: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping ___________________________________________________________________ Name: svn:ignore + build Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/readme.html =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/readme.html 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/readme.html 2010-07-19 15:46:30 UTC (rev 9422) @@ -17,6 +17,7 @@ &lt;cluster-connections&gt; &lt;cluster-connection name="my-cluster"&gt; &lt;address&gt;jms&lt;/address&gt; + &lt;connector-ref>netty-connector&lt;/connector-ref> &lt;retry-interval&gt;500&lt;/retry-interval&gt; &lt;use-duplicate-detection&gt;true&lt;/use-duplicate-detection&gt; &lt;forward-when-no-consumers&gt;true&lt;/forward-when-no-consumers&gt; Property changes on: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server0 ___________________________________________________________________ Name: svn:ignore + data Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server0/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -26,7 +26,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -41,6 +41,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Property changes on: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server1 ___________________________________________________________________ Name: svn:ignore + data Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server1/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server1/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -25,7 +25,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -40,6 +40,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Property changes on: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server2 ___________________________________________________________________ Name: svn:ignore + data Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server2/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-grouping/server2/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -25,7 +25,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -40,6 +40,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/readme.html =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/readme.html 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/readme.html 2010-07-19 15:46:30 UTC (rev 9422) @@ -20,6 +20,7 @@ <pre class="prettyprint"> <code>&lt;cluster-connection name="my-cluster"&gt; &lt;address&gt;jms&lt;/address&gt; + &lt;connector-ref>netty-connector&lt;/connector-ref> &lt;retry-interval&gt;500&lt;/retry-interval&gt; &lt;use-duplicate-detection&gt;true&lt;/use-duplicate-detection&gt; &lt;forward-when-no-consumers&gt;true&lt;/forward-when-no-consumers&gt; Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server0/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -26,7 +26,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -41,6 +41,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Modified: branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server1/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/clustered-queue/server1/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -25,7 +25,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -40,6 +40,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>true</forward-when-no-consumers> Property changes on: branches/2_2_0_HA_Improvements/examples/jms/message-group2 ___________________________________________________________________ Name: svn:ignore + build Property changes on: branches/2_2_0_HA_Improvements/examples/jms/message-group2/server0 ___________________________________________________________________ Name: svn:ignore + data Modified: branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -1,8 +1,8 @@ <configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> - <backup>true</backup> - + + <live-connector-ref connector-name="live-connector"/> <!-- Connectors --> <connectors> @@ -10,6 +10,10 @@ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> + <connector name="live-connector"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5446"/> + </connector> </connectors> <!-- Acceptors --> Modified: branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/non-transaction-failover/server1/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -1,8 +1,6 @@ <configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd"> - <backup-connector-ref connector-name="backup-connector"/> - <!-- Connectors --> <connectors> @@ -10,11 +8,6 @@ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> - - <connector name="backup-connector"> - <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="port" value="5445"/> - </connector> </connectors> <!-- Acceptors --> Modified: branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -26,7 +26,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -41,6 +41,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>false</forward-when-no-consumers> Modified: branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/queue-message-redistribution/server1/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -27,7 +27,7 @@ <group-address>231.7.7.7</group-address> <group-port>9876</group-port> <broadcast-period>100</broadcast-period> - <connector-ref connector-name="netty-connector"/> + <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -42,6 +42,7 @@ <cluster-connections> <cluster-connection name="my-cluster"> <address>jms</address> + <connector-ref>netty-connector</connector-ref> <retry-interval>500</retry-interval> <use-duplicate-detection>true</use-duplicate-detection> <forward-when-no-consumers>false</forward-when-no-consumers> Modified: branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server0/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -1,7 +1,7 @@ <configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> - <backup>true</backup> + <live-connector-ref connector-name="live-connector"/> <!-- Connectors --> @@ -10,6 +10,10 @@ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5445"/> </connector> + <connector name="live-connector"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5446"/> + </connector> </connectors> <!-- Acceptors --> Modified: branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server1/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-07-19 15:42:17 UTC (rev 9421) +++ branches/2_2_0_HA_Improvements/examples/jms/transaction-failover/server1/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422) @@ -1,8 +1,6 @@ <configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd"> - <backup-connector-ref connector-name="backup-connector"/> - <!-- Connectors --> <connectors> @@ -10,11 +8,6 @@ <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="port" value="5446"/> </connector> - - <connector name="backup-connector"> - <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="port" value="5445"/> - </connector> </connectors> <!-- Acceptors -->