[jboss-cvs] JBossAS SVN: r94950 - in branches/Branch_5_x/testsuite/src/resources/cluster: haservice and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 15 10:51:20 EDT 2009
Author: bstansberry at jboss.com
Date: 2009-10-15 10:51:19 -0400 (Thu, 15 Oct 2009)
New Revision: 94950
Modified:
branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
branches/Branch_5_x/testsuite/src/resources/cluster/haservice/jboss-beans.xml
branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml
branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/ha-singleton-jboss-beans.xml
branches/Branch_5_x/testsuite/src/resources/cluster/partition/jboss-beans.xml
branches/Branch_5_x/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
Log:
[JBAS-7209] Remove use of deprecated ClusterPartition.nodeAddress property
Remove use of deprecated HAServiceMBean.setClusterPartition
Modified: branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml 2009-10-15 13:55:26 UTC (rev 94949)
+++ branches/Branch_5_x/testsuite/src/resources/cluster/ejb2/passexp/META-INF/partition-passexp-jboss-beans.xml 2009-10-15 14:51:19 UTC (rev 94950)
@@ -124,9 +124,6 @@
<!-- Name of the partition being built -->
<property name="partitionName">PassExpPartition</property>
-
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
<!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
<property name="stateTransferTimeout">30000</property>
Modified: branches/Branch_5_x/testsuite/src/resources/cluster/haservice/jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/cluster/haservice/jboss-beans.xml 2009-10-15 13:55:26 UTC (rev 94949)
+++ branches/Branch_5_x/testsuite/src/resources/cluster/haservice/jboss-beans.xml 2009-10-15 14:51:19 UTC (rev 94950)
@@ -4,12 +4,12 @@
<bean name="EchoHAService" class="org.jboss.test.cluster.haservice.EchoHAService">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=EchoHAService", exposedInterface=org.jboss.test.cluster.haservice.EchoHAServiceMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="HAPartition"/></property>
+ <property name="HAPartition"><inject bean="HAPartition"/></property>
</bean>
<bean name="EchoHASingleton" class="org.jboss.test.cluster.haservice.EchoHASingleton">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=EchoHASingleton", exposedInterface=org.jboss.test.cluster.haservice.EchoHASingletonMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="HAPartition"/></property>
+ <property name="HAPartition"><inject bean="HAPartition"/></property>
</bean>
</deployment>
\ No newline at end of file
Modified: branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml 2009-10-15 13:55:26 UTC (rev 94949)
+++ branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml 2009-10-15 14:51:19 UTC (rev 94950)
@@ -22,7 +22,7 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonController_1", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="HASingletonElectionPolicySimple_1"/></property>
<property name="target"><inject bean="HASingletonMBeanExample_1"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -46,7 +46,7 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonController_2", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="HASingletonElectionPolicySimple_2"/></property>
<property name="target"><inject bean="HASingletonMBeanExample_2"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -70,7 +70,7 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonController_3", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="HASingletonElectionPolicySimple_3"/></property>
<property name="target"><inject bean="HASingletonMBeanExample_3"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -89,7 +89,7 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonController_4", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="target"><inject bean="HASingletonMBeanExample_4"/></property>
<property name="targetStartMethod">startSingleton</property>
<property name="targetStopMethod">stopSingleton</property>
@@ -113,7 +113,7 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonController_5", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="PreferredMasterElectionPolicy_1"/></property>
<property name="target"><inject bean="HASingletonMBeanExample_5"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -138,7 +138,7 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonController_6", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="PreferredMasterElectionPolicy_2"/></property>
<property name="target"><inject bean="HASingletonMBeanExample_6"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -159,7 +159,7 @@
<bean class="org.jboss.ha.singleton.HASingletonController"
name="HASingletonControllerForBean_1">
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="HASingletonElectionPolicySimple_1"/></property>
<property name="target"><inject bean="HASingletonPojoExample_1"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -175,7 +175,7 @@
<bean class="org.jboss.ha.singleton.HASingletonController"
name="HASingletonControllerForBean_2">
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="HASingletonElectionPolicySimple_2"/></property>
<property name="target"><inject bean="HASingletonPojoExample_2"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -191,7 +191,7 @@
<bean class="org.jboss.ha.singleton.HASingletonController"
name="HASingletonControllerForBean_3">
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="HASingletonElectionPolicySimple_3"/></property>
<property name="target"><inject bean="HASingletonPojoExample_3"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -207,7 +207,7 @@
<bean class="org.jboss.ha.singleton.HASingletonController"
name="HASingletonControllerForBean_4">
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="target"><inject bean="HASingletonPojoExample_4"/></property>
<property name="targetStartMethod">startSingleton</property>
<property name="targetStopMethod">stopSingleton</property>
@@ -222,7 +222,7 @@
<bean class="org.jboss.ha.singleton.HASingletonController"
name="HASingletonControllerForBean_5">
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="PreferredMasterElectionPolicy_1"/></property>
<property name="target"><inject bean="HASingletonPojoExample_5"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -239,7 +239,7 @@
<bean class="org.jboss.ha.singleton.HASingletonController"
name="HASingletonControllerForBean_6">
- <property name="clusterPartition"><inject bean="ElectionPolicyTestPartition"/></property>
+ <property name="HAPartition"><inject bean="ElectionPolicyTestPartition"/></property>
<property name="electionPolicy"><inject bean="PreferredMasterElectionPolicy_2"/></property>
<property name="target"><inject bean="HASingletonPojoExample_6"/></property>
<property name="targetStartMethod">startSingleton</property>
@@ -338,9 +338,6 @@
<!-- Name of the partition being built -->
<property name="partitionName">ElectionPolicyTestPartition</property>
-
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
<!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
<property name="stateTransferTimeout">2000</property>
Modified: branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/ha-singleton-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/ha-singleton-jboss-beans.xml 2009-10-15 13:55:26 UTC (rev 94949)
+++ branches/Branch_5_x/testsuite/src/resources/cluster/hasingleton/ha-singleton-jboss-beans.xml 2009-10-15 14:51:19 UTC (rev 94950)
@@ -14,7 +14,7 @@
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=TestHASingletonControllerBean", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true)</annotation>
- <property name="clusterPartition"><inject bean="HAPartition"/></property>
+ <property name="HAPartition"><inject bean="HAPartition"/></property>
<property name="target"><inject bean="SimpleHaSingletonPojo"/></property>
<property name="targetStartMethod">startSingleton</property>
<property name="targetStopMethod">stopSingleton</property>
Modified: branches/Branch_5_x/testsuite/src/resources/cluster/partition/jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/cluster/partition/jboss-beans.xml 2009-10-15 13:55:26 UTC (rev 94949)
+++ branches/Branch_5_x/testsuite/src/resources/cluster/partition/jboss-beans.xml 2009-10-15 14:51:19 UTC (rev 94950)
@@ -102,9 +102,6 @@
<!-- Name of the partition being built -->
<property name="partitionName">BadProviderPartition</property>
-
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
<!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
<property name="stateTransferTimeout">2000</property>
@@ -155,9 +152,6 @@
<!-- Name of the partition being built -->
<property name="partitionName">BadStatePartition</property>
-
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
<!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
<property name="stateTransferTimeout">2000</property>
@@ -208,9 +202,6 @@
<!-- Name of the partition being built -->
<property name="partitionName">NoStatePartition</property>
-
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
<!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
<property name="stateTransferTimeout">2000</property>
@@ -245,8 +236,6 @@
<!-- Name of the partition being built -->
<property name="partitionName">GoodStatePartition</property>
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
<!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
<property name="stateTransferTimeout">2000</property>
Modified: branches/Branch_5_x/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml 2009-10-15 13:55:26 UTC (rev 94949)
+++ branches/Branch_5_x/testsuite/src/resources/cluster/partition/partition-restart-jboss-beans.xml 2009-10-15 14:51:19 UTC (rev 94950)
@@ -113,9 +113,6 @@
<!-- Name of the partition being built -->
<property name="partitionName">RestartPartition</property>
-
- <!-- The address used to determine the node name -->
- <property name="nodeAddress">${jboss.bind.address}</property>
<!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
<property name="stateTransferTimeout">30000</property>
More information about the jboss-cvs-commits
mailing list