[hornetq-commits] JBoss hornetq SVN: r10178 - in branches/Branch_2_2_EAP/src: config/jboss-as-4/clustered and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Feb 4 09:56:36 EST 2011
Author: ataylor
Date: 2011-02-04 09:56:35 -0500 (Fri, 04 Feb 2011)
New Revision: 10178
Modified:
branches/Branch_2_2_EAP/src/config/jboss-as-4/clustered/ra.xml
branches/Branch_2_2_EAP/src/config/jboss-as-4/non-clustered/ra.xml
branches/Branch_2_2_EAP/src/config/ra.xml
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
Log:
https://issues.jboss.org/browse/JBPAPP-5791 - updated example ra and removed some unwanted methods
Modified: branches/Branch_2_2_EAP/src/config/jboss-as-4/clustered/ra.xml
===================================================================
--- branches/Branch_2_2_EAP/src/config/jboss-as-4/clustered/ra.xml 2011-02-04 14:38:32 UTC (rev 10177)
+++ branches/Branch_2_2_EAP/src/config/jboss-as-4/clustered/ra.xml 2011-02-04 14:56:35 UTC (rev 10178)
@@ -70,8 +70,20 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>getTm</config-property-value>
</config-property>
- <!--
+ <!--
<config-property>
+ <description>Does we support HA</description>
+ <config-property-name>HA</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <description>The method to use for locating the transactionmanager</description>
+ <config-property-name>TransactionManagerLocatorMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>getTm</config-property-value>
+ </config-property>
+ <config-property>
<description>Use A local Transaction instead of XA?</description>
<config-property-name>UseLocalTx</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
@@ -90,26 +102,14 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The Backup transport type</description>
- <config-property-name>BackUpTransportType</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The Backup transport configuration. These values must be in the form of key=val;key=val;</description>
- <config-property-name>TransportConfiguration</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
<description>The discovery group address</description>
- <config-property-name>DiscoveryGroupAddress</config-property-name>
+ <config-property-name>DiscoveryAddress</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
<config-property>
<description>The discovery group port</description>
- <config-property-name>DiscoveryGroupPort</config-property-name>
+ <config-property-name>DiscoveryPort</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value></config-property-value>
</config-property>
@@ -174,8 +174,8 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The producer window size</description>
- <config-property-name>ProducerWindowSize</config-property-name>
+ <description>The confirmation window size</description>
+ <config-property-name>ConfirmationWindowSize</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value></config-property-value>
</config-property>
@@ -216,7 +216,7 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The max connections</description>
+ <description>The max connections</description>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value></config-property-value>
</config-property>
@@ -239,12 +239,6 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>Should clean server shutdown trigger failover?</description>
- <config-property-name>FailoverOnServerShutdown</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
<description>The client id</description>
<config-property-name>ClientID</config-property-name>
<config-property-type>java.lang.String</config-property-type>
Modified: branches/Branch_2_2_EAP/src/config/jboss-as-4/non-clustered/ra.xml
===================================================================
--- branches/Branch_2_2_EAP/src/config/jboss-as-4/non-clustered/ra.xml 2011-02-04 14:38:32 UTC (rev 10177)
+++ branches/Branch_2_2_EAP/src/config/jboss-as-4/non-clustered/ra.xml 2011-02-04 14:56:35 UTC (rev 10178)
@@ -70,8 +70,20 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>getTm</config-property-value>
</config-property>
- <!--
+ <!--
<config-property>
+ <description>Does we support HA</description>
+ <config-property-name>HA</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
+ <description>The method to use for locating the transactionmanager</description>
+ <config-property-name>TransactionManagerLocatorMethod</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>getTm</config-property-value>
+ </config-property>
+ <config-property>
<description>Use A local Transaction instead of XA?</description>
<config-property-name>UseLocalTx</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
@@ -90,26 +102,14 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The Backup transport type</description>
- <config-property-name>BackUpTransportType</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The Backup transport configuration. These values must be in the form of key=val;key=val;</description>
- <config-property-name>TransportConfiguration</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
<description>The discovery group address</description>
- <config-property-name>DiscoveryGroupAddress</config-property-name>
+ <config-property-name>DiscoveryAddress</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
<config-property>
<description>The discovery group port</description>
- <config-property-name>DiscoveryGroupPort</config-property-name>
+ <config-property-name>DiscoveryPort</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value></config-property-value>
</config-property>
@@ -174,8 +174,8 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The producer window size</description>
- <config-property-name>ProducerWindowSize</config-property-name>
+ <description>The confirmation window size</description>
+ <config-property-name>ConfirmationWindowSize</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value></config-property-value>
</config-property>
@@ -198,7 +198,7 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The block on non-durable send</description>
+ <description>The block on non durable send</description>
<config-property-name>BlockOnNonDurableSend</config-property-name>
<config-property-type>java.lang.Boolean</config-property-type>
<config-property-value></config-property-value>
@@ -216,7 +216,7 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The max connections</description>
+ <description>The max connections</description>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value></config-property-value>
</config-property>
@@ -239,12 +239,6 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>Should clean server shutdown trigger failover?</description>
- <config-property-name>FailoverOnServerShutdown</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
<description>The client id</description>
<config-property-name>ClientID</config-property-name>
<config-property-type>java.lang.String</config-property-type>
Modified: branches/Branch_2_2_EAP/src/config/ra.xml
===================================================================
--- branches/Branch_2_2_EAP/src/config/ra.xml 2011-02-04 14:38:32 UTC (rev 10177)
+++ branches/Branch_2_2_EAP/src/config/ra.xml 2011-02-04 14:56:35 UTC (rev 10178)
@@ -47,6 +47,12 @@
</config-property>
<!--
<config-property>
+ <description>Does we support HA</description>
+ <config-property-name>HA</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ <config-property-value>false</config-property-value>
+ </config-property>
+ <config-property>
<description>The method to use for locating the transactionmanager</description>
<config-property-name>TransactionManagerLocatorMethod</config-property-name>
<config-property-type>java.lang.String</config-property-type>
@@ -71,26 +77,14 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>The Backup transport type</description>
- <config-property-name>BackUpTransportType</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
- <description>The Backup transport configuration. These values must be in the form of key=val;key=val;</description>
- <config-property-name>TransportConfiguration</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
<description>The discovery group address</description>
- <config-property-name>DiscoveryGroupAddress</config-property-name>
+ <config-property-name>DiscoveryAddress</config-property-name>
<config-property-type>java.lang.String</config-property-type>
<config-property-value></config-property-value>
</config-property>
<config-property>
<description>The discovery group port</description>
- <config-property-name>DiscoveryGroupPort</config-property-name>
+ <config-property-name>DiscoveryPort</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
<config-property-value></config-property-value>
</config-property>
@@ -220,12 +214,6 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
- <description>Should clean server shutdown trigger failover?</description>
- <config-property-name>FailoverOnServerShutdown</config-property-name>
- <config-property-type>java.lang.Boolean</config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <config-property>
<description>The client id</description>
<config-property-name>ClientID</config-property-name>
<config-property-type>java.lang.String</config-property-type>
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2011-02-04 14:38:32 UTC (rev 10177)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2011-02-04 14:56:35 UTC (rev 10178)
@@ -95,8 +95,6 @@
private Integer reconnectAttempts = -1;
- private Boolean failoverOnServerShutdown;
-
private Boolean useGlobalPools;
private Integer scheduledThreadPoolMaxSize;
@@ -624,26 +622,6 @@
this.reconnectAttempts = reconnectAttempts;
}
- public Boolean isFailoverOnServerShutdown()
- {
- if (ConnectionFactoryProperties.trace)
- {
- ConnectionFactoryProperties.log.trace("isFailoverOnServerShutdown()");
- }
- hasBeenUpdated = true;
- return failoverOnServerShutdown;
- }
-
- public void setFailoverOnServerShutdown(final Boolean failoverOnServerShutdown)
- {
- if (ConnectionFactoryProperties.trace)
- {
- ConnectionFactoryProperties.log.trace("setFailoverOnServerShutdown(" + failoverOnServerShutdown + ")");
- }
- hasBeenUpdated = true;
- this.failoverOnServerShutdown = failoverOnServerShutdown;
- }
-
public Boolean isUseGlobalPools()
{
if (ConnectionFactoryProperties.trace)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2011-02-04 14:38:32 UTC (rev 10177)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2011-02-04 14:56:35 UTC (rev 10178)
@@ -650,16 +650,6 @@
mcfProperties.setReconnectAttempts(reconnectAttempts);
}
- public Boolean isFailoverOnServerShutdown()
- {
- return mcfProperties.isFailoverOnServerShutdown();
- }
-
- public void setFailoverOnServerShutdown(final Boolean failoverOnServerShutdown)
- {
- mcfProperties.setFailoverOnServerShutdown(failoverOnServerShutdown);
- }
-
public Boolean isUseGlobalPools()
{
return mcfProperties.isUseGlobalPools();
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-02-04 14:38:32 UTC (rev 10177)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-02-04 14:56:35 UTC (rev 10178)
@@ -260,6 +260,17 @@
}
}
+
+ public Boolean getHA()
+ {
+ return raProperties.isHA();
+ }
+
+ public void setHA(final Boolean ha)
+ {
+ this.raProperties.setHA(ha);
+ }
+
/**
* Get the discovery group name
*
@@ -319,16 +330,6 @@
raProperties.setDiscoveryPort(dgp);
}
-
- public Boolean isHA()
- {
- return raProperties.isHA();
- }
-
- public void setHA(final Boolean ha)
- {
- this.raProperties.setHA(ha);
- }
/**
* Get discovery refresh timeout
@@ -960,46 +961,6 @@
raProperties.setReconnectAttempts(reconnectAttempts);
}
- /**
- * Get failover on server shutdown
- *
- * @return The value
- */
- public Boolean isFailoverOnServerShutdown()
- {
- if (HornetQResourceAdapter.trace)
- {
- HornetQResourceAdapter.log.trace("isFailoverOnServerShutdown()");
- }
-
- return raProperties.isFailoverOnServerShutdown();
- }
-
- /**
- * Get failover on server shutdown
- *
- * @return The value
- */
- public Boolean getFailoverOnServerShutdown()
- {
- return isFailoverOnServerShutdown();
- }
-
- /**
- * Set failover on server shutdown
- *
- * @param failoverOnServerShutdown The value
- */
- public void setFailoverOnServerShutdown(final Boolean failoverOnServerShutdown)
- {
- if (HornetQResourceAdapter.trace)
- {
- HornetQResourceAdapter.log.trace("setFailoverOnServerShutdown(" + failoverOnServerShutdown + ")");
- }
-
- raProperties.setFailoverOnServerShutdown(failoverOnServerShutdown);
- }
-
public String getConnectionLoadBalancingPolicyClassName()
{
return raProperties.getConnectionLoadBalancingPolicyClassName();
@@ -1383,7 +1344,7 @@
String discoveryAddress = overrideProperties.getDiscoveryAddress() != null ? overrideProperties.getDiscoveryAddress()
: getDiscoveryAddress();
- Boolean ha = overrideProperties.isHA() != null ? overrideProperties.isHA() : isHA();
+ Boolean ha = overrideProperties.isHA() != null ? overrideProperties.isHA() : getHA();
if (connectorClassName != null)
{
More information about the hornetq-commits
mailing list