JBoss hornetq SVN: r9423 - in branches/2_2_0_HA_Improvements/examples/jms: bridge/server0 and 6 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 11:47:34 -0400 (Mon, 19 Jul 2010)
New Revision: 9423
Modified:
branches/2_2_0_HA_Improvements/examples/jms/bridge/readme.html
branches/2_2_0_HA_Improvements/examples/jms/bridge/server0/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/divert/readme.html
branches/2_2_0_HA_Improvements/examples/jms/divert/server0/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/embedded/
Log:
HA refactoring
* fix JMS examples' server configuration
Modified: branches/2_2_0_HA_Improvements/examples/jms/bridge/readme.html
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/bridge/readme.html 2010-07-19 15:46:30 UTC (rev 9422)
+++ branches/2_2_0_HA_Improvements/examples/jms/bridge/readme.html 2010-07-19 15:47:34 UTC (rev 9423)
@@ -44,7 +44,9 @@
<filter string="name='aardvark'"/>
<transformer-class-name>org.hornetq.jms.example.HatColourChangeTransformer</transformer-class-name>
<reconnect-attempts>-1</reconnect-attempts>
- <connector-ref connector-name="remote-connector"/>
+ <static-connectors>
+ <connector-ref>remote-connector</connector-ref>
+ </static-connectors>
</bridge>
</code>
</pre>
Modified: branches/2_2_0_HA_Improvements/examples/jms/bridge/server0/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/bridge/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422)
+++ branches/2_2_0_HA_Improvements/examples/jms/bridge/server0/hornetq-configuration.xml 2010-07-19 15:47:34 UTC (rev 9423)
@@ -40,8 +40,10 @@
<forwarding-address>jms.queue.mincing-machine</forwarding-address>
<filter string="name='aardvark'"/>
<transformer-class-name>org.hornetq.jms.example.HatColourChangeTransformer</transformer-class-name>
- <reconnect-attempts>-1</reconnect-attempts>
- <connector-ref connector-name="remote-connector"/>
+ <reconnect-attempts>-1</reconnect-attempts>
+ <static-connectors>
+ <connector-ref>remote-connector</connector-ref>
+ </static-connectors>
</bridge>
</bridges>
Modified: branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422)
+++ branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server0/hornetq-configuration.xml 2010-07-19 15:47:34 UTC (rev 9423)
@@ -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>
Modified: branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422)
+++ branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server1/hornetq-configuration.xml 2010-07-19 15:47:34 UTC (rev 9423)
@@ -28,7 +28,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>
Modified: branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422)
+++ branches/2_2_0_HA_Improvements/examples/jms/client-side-load-balancing/server2/hornetq-configuration.xml 2010-07-19 15:47:34 UTC (rev 9423)
@@ -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>
Modified: branches/2_2_0_HA_Improvements/examples/jms/divert/readme.html
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/divert/readme.html 2010-07-19 15:46:30 UTC (rev 9422)
+++ branches/2_2_0_HA_Improvements/examples/jms/divert/readme.html 2010-07-19 15:47:34 UTC (rev 9423)
@@ -88,7 +88,9 @@
<queue-name>jms.queue.priceForwarding</queue-name>
<forwarding-address>jms.topic.newYorkPriceUpdates</forwarding-address>
<reconnect-attempts>-1</reconnect-attempts>
- <connector-ref connector-name="newyork-connector"/>
+ <static-connectors>
+ <connector-ref>newyork-connector</connector-ref>
+ </static-connectors>
</bridge>
</bridges>
</code>
Modified: branches/2_2_0_HA_Improvements/examples/jms/divert/server0/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/divert/server0/hornetq-configuration.xml 2010-07-19 15:46:30 UTC (rev 9422)
+++ branches/2_2_0_HA_Improvements/examples/jms/divert/server0/hornetq-configuration.xml 2010-07-19 15:47:34 UTC (rev 9423)
@@ -63,7 +63,9 @@
<queue-name>jms.queue.priceForwarding</queue-name>
<forwarding-address>jms.topic.newYorkPriceUpdates</forwarding-address>
<reconnect-attempts>-1</reconnect-attempts>
- <connector-ref connector-name="newyork-connector"/>
+ <static-connectors>
+ <connector-ref>newyork-connector</connector-ref>
+ </static-connectors>
</bridge>
</bridges>
Property changes on: branches/2_2_0_HA_Improvements/examples/jms/embedded
___________________________________________________________________
Name: svn:ignore
- logs
build
+ logs
build
data
13 years, 11 months
JBoss hornetq SVN: r9422 - in branches/2_2_0_HA_Improvements/examples/jms: clustered-durable-subscription/server1 and 15 other directories.
by do-not-reply＠jboss.org
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 @@
<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/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><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/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 -->
13 years, 11 months
JBoss hornetq SVN: r9421 - in branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests: tools/container and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 11:42:17 -0400 (Mon, 19 Jul 2010)
New Revision: 9421
Modified:
branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java
branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java
branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java
Log:
HA refactoring
* fix JMS tests compilation
Modified: branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-07-19 14:28:26 UTC (rev 9420)
+++ branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-07-19 15:42:17 UTC (rev 9421)
@@ -21,9 +21,9 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
-import org.hornetq.api.core.Pair;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.HornetQClient;
+import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
import org.hornetq.jms.client.HornetQConnectionFactory;
/**
@@ -58,13 +58,11 @@
List<String> bindings = new ArrayList<String>();
bindings.add("StrictTCKConnectionFactory");
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>();
+ List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>();
+ connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName()));
- connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"),
- null));
-
-
getJmsServerManager().createConnectionFactory("StrictTCKConnectionFactory",
+ false,
connectorConfigs,
null,
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
Modified: branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-07-19 14:28:26 UTC (rev 9420)
+++ branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-07-19 15:42:17 UTC (rev 9421)
@@ -18,9 +18,9 @@
import javax.naming.InitialContext;
-import org.hornetq.api.core.Pair;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.HornetQClient;
+import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
import org.hornetq.jms.client.HornetQConnectionFactory;
/**
@@ -54,13 +54,12 @@
// All jms tests should use a specific cg which has blockOnAcknowledge = true and
// both np and p messages are sent synchronously
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>();
+ List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>();
+ connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName()));
- connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"),
- null));
-
getJmsServerManager().createConnectionFactory("testsuitecf",
+ false,
connectorConfigs,
null,
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
Modified: branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-07-19 14:28:26 UTC (rev 9420)
+++ branches/2_2_0_HA_Improvements/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-07-19 15:42:17 UTC (rev 9421)
@@ -26,7 +26,6 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
-import org.hornetq.api.core.Pair;
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.management.ObjectNameBuilder;
@@ -34,6 +33,7 @@
import org.hornetq.api.jms.management.JMSQueueControl;
import org.hornetq.api.jms.management.TopicControl;
import org.hornetq.core.logging.Logger;
+import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.integration.bootstrap.HornetQBootstrapServer;
@@ -285,12 +285,11 @@
final boolean blockOnAcknowledge,
final String ... jndiBindings) throws Exception
{
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>();
+ List<TransportConfiguration> connectorConfigs = new ArrayList<TransportConfiguration>();
+ connectorConfigs.add(new TransportConfiguration(NettyConnectorFactory.class.getName()));
- connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(new TransportConfiguration("org.hornetq.core.remoting.impl.netty.NettyConnectorFactory"),
- null));
-
getJMSServerManager().createConnectionFactory(objectName,
+ false,
connectorConfigs,
clientId,
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
13 years, 11 months
JBoss hornetq SVN: r9420 - in branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster: server0 and 6 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 10:28:26 -0400 (Mon, 19 Jul 2010)
New Revision: 9420
Modified:
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/readme.html
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml
branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java
Log:
HA refactoring
* fix JMS Symmetric Cluster example to use HA API and configuration
Modified: branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/readme.html
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/readme.html 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/readme.html 2010-07-19 14:28:26 UTC (rev 9420)
@@ -32,6 +32,7 @@
<code>
<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>
@@ -62,7 +63,7 @@
<pre class="prettyprint">
<code>
- ConnectionFactory cf = HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876);
+ ConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithHA("231.7.7.7", 9876);
</code>
</pre>
Modified: branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server0/hornetq-configuration.xml 2010-07-19 14:28:26 UTC (rev 9420)
@@ -29,7 +29,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>
@@ -44,6 +44,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/symmetric-cluster/server1/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server1/hornetq-configuration.xml 2010-07-19 14:28:26 UTC (rev 9420)
@@ -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/symmetric-cluster/server2/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server2/hornetq-configuration.xml 2010-07-19 14:28:26 UTC (rev 9420)
@@ -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/symmetric-cluster/server3/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server3/hornetq-configuration.xml 2010-07-19 14:28:26 UTC (rev 9420)
@@ -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/symmetric-cluster/server4/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server4/hornetq-configuration.xml 2010-07-19 14:28:26 UTC (rev 9420)
@@ -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/symmetric-cluster/server5/hornetq-configuration.xml
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/server5/hornetq-configuration.xml 2010-07-19 14:28:26 UTC (rev 9420)
@@ -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/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-07-19 14:27:00 UTC (rev 9419)
+++ branches/2_2_0_HA_Improvements/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-07-19 14:28:26 UTC (rev 9420)
@@ -79,7 +79,7 @@
// connection factory directly we avoid having to worry about a JNDI look-up.
// In an app server environment you could use HA-JNDI to lookup from the clustered JNDI servers without
// having to know about a specific one.
- ConnectionFactory cf = HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876);
+ ConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithHA("231.7.7.7", 9876);
// We give a little while for each server to broadcast its whereabouts to the client
Thread.sleep(2000);
13 years, 11 months
JBoss hornetq SVN: r9419 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 10:27:00 -0400 (Mon, 19 Jul 2010)
New Revision: 9419
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
HA refactoring
* fix NPE and ClassCastException
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-07-19 14:25:47 UTC (rev 9418)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-07-19 14:27:00 UTC (rev 9419)
@@ -71,7 +71,7 @@
private TransportConfiguration[] initialConnectors;
- private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology;
+ private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology = new HashMap<String, Pair<TransportConfiguration,TransportConfiguration>>();
private Pair<TransportConfiguration, TransportConfiguration>[] topologyArray;
@@ -1093,7 +1093,7 @@
{
List<DiscoveryEntry> newConnectors = discoveryGroup.getDiscoveryEntries();
- this.initialConnectors = (TransportConfiguration[])Array.newInstance(Pair.class, newConnectors.size());
+ this.initialConnectors = (TransportConfiguration[])Array.newInstance(TransportConfiguration.class, newConnectors.size());
int count = 0;
for (DiscoveryEntry entry : newConnectors)
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-07-19 14:25:47 UTC (rev 9418)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-07-19 14:27:00 UTC (rev 9419)
@@ -224,7 +224,7 @@
private Set<ClusterTopologyListener> clusterConnectionListeners = new ConcurrentHashSet<ClusterTopologyListener>();
- private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology;
+ private Map<String, Pair<TransportConfiguration, TransportConfiguration>> topology = new HashMap<String, Pair<TransportConfiguration,TransportConfiguration>>();
public synchronized void registerTopologyListener(final ClusterTopologyListener listener,
final boolean clusterConnection)
13 years, 11 months
JBoss hornetq SVN: r9418 - branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/core/config/impl.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 10:25:47 -0400 (Mon, 19 Jul 2010)
New Revision: 9418
Modified:
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java
Log:
comment warning about failing test when run inside eclipse (and intellij?)
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-07-19 13:46:01 UTC (rev 9417)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-07-19 14:25:47 UTC (rev 9418)
@@ -42,13 +42,15 @@
// Public --------------------------------------------------------
+ /**
+ * test does not pass in eclipse (because it can not find hornetq-configuration.xsd).
+ * It runs fine on the CLI with the proper env setting.
+ */
public void testMinimalConfiguration() throws Exception
{
String xml = "<configuration xmlns='urn:hornetq'>" + "</configuration>";
- Element element = org.hornetq.utils.XMLUtil.stringToElement(xml);
+ Element element = XMLUtil.stringToElement(xml);
Assert.assertNotNull(element);
- element = XMLUtil.stringToElement(xml);
- Assert.assertNotNull(element);
XMLUtil.validate(element, "hornetq-configuration.xsd");
}
13 years, 11 months
JBoss hornetq SVN: r9417 - in branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory: src/org/hornetq/jms/example and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 09:46:01 -0400 (Mon, 19 Jul 2010)
New Revision: 9417
Modified:
branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/readme.html
branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java
Log:
HA refactoring
* fix JMS Instantiate Connection Factory example to use new HA API
Modified: branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/readme.html
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/readme.html 2010-07-19 13:43:10 UTC (rev 9416)
+++ branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/readme.html 2010-07-19 13:46:01 UTC (rev 9417)
@@ -55,7 +55,7 @@
<li>Directly instantiate the JMS ConnectionFactory object using that TransportConfiguration.</li>
<pre class="prettyprint">
<code>
- ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration);
+ ConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(transportConfiguration);
</code>
</pre>
Modified: branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-07-19 13:43:10 UTC (rev 9416)
+++ branches/2_2_0_HA_Improvements/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-07-19 13:46:01 UTC (rev 9417)
@@ -65,7 +65,7 @@
connectionParams);
// Step 3 Directly instantiate the JMS ConnectionFactory object using that TransportConfiguration
- ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration);
+ ConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(transportConfiguration);
// Step 4.Create a JMS Connection
connection = cf.createConnection();
13 years, 11 months
JBoss hornetq SVN: r9416 - branches/2_2_0_HA_Improvements.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 09:43:10 -0400 (Mon, 19 Jul 2010)
New Revision: 9416
Modified:
branches/2_2_0_HA_Improvements/build-hornetq.xml
Log:
fork Server's JVM in runServer target
Modified: branches/2_2_0_HA_Improvements/build-hornetq.xml
===================================================================
--- branches/2_2_0_HA_Improvements/build-hornetq.xml 2010-07-19 13:37:15 UTC (rev 9415)
+++ branches/2_2_0_HA_Improvements/build-hornetq.xml 2010-07-19 13:43:10 UTC (rev 9416)
@@ -1678,7 +1678,7 @@
<target name="runServer" depends="jar">
<mkdir dir="logs"/>
<property name="server.config" value="${src.config.trunk.non-clustered.dir}"/>
- <java classname="org.hornetq.integration.bootstrap.HornetQBootstrapServer" fork="false">
+ <java classname="org.hornetq.integration.bootstrap.HornetQBootstrapServer" fork="true">
<jvmarg value="-XX:+UseParallelGC"/>
<jvmarg value="-Xms512M"/>
<jvmarg value="-Xmx2048M"/>
13 years, 11 months
JBoss hornetq SVN: r9415 - branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 09:37:15 -0400 (Mon, 19 Jul 2010)
New Revision: 9415
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
Log:
HA refactoring
* in close(), copy the sessions set to prevent a ConcurrentModificationException
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2010-07-19 13:36:15 UTC (rev 9414)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2010-07-19 13:37:15 UTC (rev 9415)
@@ -396,7 +396,8 @@
{
synchronized (failoverLock)
{
- for (ClientSession session : sessions)
+ // work on a copied set. the session will be removed from sessions when session.close() is called
+ for (ClientSession session : new HashSet<ClientSession>(sessions))
{
try
{
13 years, 11 months
JBoss hornetq SVN: r9414 - branches/2_2_0_HA_Improvements/examples/jms/applet/src/org/hornetq/jms/example.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-19 09:36:15 -0400 (Mon, 19 Jul 2010)
New Revision: 9414
Modified:
branches/2_2_0_HA_Improvements/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java
Log:
HA refactoring
* fix JMS Applet example to use ServerLocator API
Modified: branches/2_2_0_HA_Improvements/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java
===================================================================
--- branches/2_2_0_HA_Improvements/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-07-19 13:35:56 UTC (rev 9413)
+++ branches/2_2_0_HA_Improvements/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-07-19 13:36:15 UTC (rev 9414)
@@ -44,8 +44,6 @@
import javax.swing.SwingUtilities;
import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.core.client.ClientSessionFactory;
-import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.jms.HornetQJMSClient;
import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
@@ -108,8 +106,7 @@
Map<String, Object> params = new HashMap<String, Object>();
TransportConfiguration connector = new TransportConfiguration(NettyConnectorFactory.class.getName(), params);
- ClientSessionFactory sf = HornetQClient.createClientSessionFactory(connector);
- ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(sf);
+ ConnectionFactory cf = HornetQJMSClient.createConnectionFactoryWithoutHA(connector);
destination = HornetQJMSClient.createTopic("exampleTopic");
try
13 years, 11 months