[jboss-cvs] JBossAS SVN: r65415 - in trunk/testsuite/src/resources/cluster: partition and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 14 17:48:58 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-09-14 17:48:58 -0400 (Fri, 14 Sep 2007)
New Revision: 65415
Modified:
trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml
trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml
Log:
[JBAS-4724] DRM lifecycle must be controlled by ClusterPartition
Don't inject DS via the config object
Modified: trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml 2007-09-14 21:47:39 UTC (rev 65414)
+++ trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml 2007-09-14 21:48:58 UTC (rev 65415)
@@ -168,15 +168,6 @@
</bean>
<!-- ==================================================================== -->
- <!-- DistributedReplicantManager Service -->
- <!-- ==================================================================== -->
- <bean name="ElectionPolicyTestPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=ElectionPolicyTestPartitionDRM,partitionName=ElectionPolicyTestPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
- <property name="HAPartition"><inject bean="ElectionPolicyTestPartition" state="Create"/></property>
- <depends>ElectionPolicyTestPartition</depends>
- </bean>
-
- <!-- ==================================================================== -->
<!-- Partition used for testing failure to receive state -->
<!-- ==================================================================== -->
@@ -190,8 +181,6 @@
<!-- ClusterPartition requires a Cache for state management -->
<property name="clusteredCache"><inject bean="ElectionPolicyTestCache"/></property>
- <!--property name="distributedState"><inject bean="DistributedState"/></property-->
-
<!-- Name of the partition being built -->
<property name="partitionName">ElectionPolicyTestPartition</property>
@@ -214,7 +203,11 @@
</parameter>
</constructor>
- <property name="distributedReplicantManager"><inject bean="ElectionPolicyTestPartitionDRM" state="Instantiated"/></property>
+ <property name="distributedReplicantManagerImpl">
+ <bean name="ElectionPolicyTestPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=ElectionPolicyTestPartitionDRM,partitionName=ElectionPolicyTestPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+ </property>
</bean>
Modified: trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml 2007-09-14 21:47:39 UTC (rev 65414)
+++ trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml 2007-09-14 21:48:58 UTC (rev 65415)
@@ -98,12 +98,6 @@
class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadProviderPartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
-
- <bean name="BadProviderPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadProviderPartitionDRM,partitionName=BadProviderPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
- <property name="HAPartition"><inject bean="BadProviderPartition" state="Create"/></property>
- <depends>BadProviderPartition</depends>
- </bean>
<bean name="BadProviderPartition"
class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
@@ -119,8 +113,6 @@
<!-- ClusterPartition requires a Cache for state management -->
<property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
- <!--property name="distributedState"><inject bean="DistributedState"/></property-->
-
<!-- Name of the partition being built -->
<property name="partitionName">BadProviderPartition</property>
@@ -143,7 +135,13 @@
</parameter>
</constructor>
- <property name="distributedReplicantManager"><inject bean="BadProviderPartitionDRM" state="Instantiated"/></property>
+ <property name="distributedReplicantManagerImpl">
+
+ <bean name="BadProviderPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadProviderPartitionDRM,partitionName=BadProviderPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+
+ </property>
<property name="startupRecorder"><inject bean="BadProviderPartitionRecorder"/></property>
@@ -179,12 +177,6 @@
class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
-
- <bean name="BadStatePartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadStatePartitionDRM,partitionName=BadStatePartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
- <property name="HAPartition"><inject bean="BadStatePartition" state="Create"/></property>
- <depends>BadStatePartition</depends>
- </bean>
<bean name="BadStatePartition"
class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
@@ -199,8 +191,6 @@
<!-- ClusterPartition requires a Cache for state management -->
<property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
-
- <!--property name="distributedState"><inject bean="DistributedState"/></property-->
<!-- Name of the partition being built -->
<property name="partitionName">BadStatePartition</property>
@@ -224,7 +214,11 @@
</parameter>
</constructor>
- <property name="distributedReplicantManager"><inject bean="BadStatePartitionDRM" state="Instantiated"/></property>
+ <property name="distributedReplicantManagerImpl">
+ <bean name="BadStatePartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=BadStatePartitionDRM,partitionName=BadStatePartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+ </property>
<property name="startupRecorder"><inject bean="BadStatePartitionRecorder"/></property>
@@ -260,12 +254,6 @@
class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NoStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
-
- <bean name="NoStatePartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NoStatePartitionDRM,partitionName=NoStatePartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
- <property name="HAPartition"><inject bean="NoStatePartition" state="Create"/></property>
- <depends>NoStatePartition</depends>
- </bean>
<bean name="NoStatePartition"
class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
@@ -279,8 +267,6 @@
<!-- ClusterPartition requires a Cache for state management -->
<property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
- <!--property name="distributedState"><inject bean="DistributedState"/></property-->
-
<!-- Name of the partition being built -->
<property name="partitionName">NoStatePartition</property>
@@ -303,7 +289,11 @@
</parameter>
</constructor>
- <property name="distributedReplicantManager"><inject bean="NoStatePartitionDRM" state="Instantiated"/></property>
+ <property name="distributedReplicantManagerImpl">
+ <bean name="NoStatePartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=NoStatePartitionDRM,partitionName=NoStatePartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+ </property>
<property name="startupRecorder"><inject bean="NoStatePartitionRecorder"/></property>
@@ -318,12 +308,6 @@
class="org.jboss.test.cluster.hapartition.state.HAPartitionRecorder">
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=GoodStatePartitionRecorder", exposedInterface=org.jboss.test.cluster.hapartition.state.HAPartitionRecorderMBean.class, registerDirectly=true)</annotation>
</bean>
-
- <bean name="GoodStatePartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=GoodStatePartitionDRM,partitionName=GoodStatePartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
- <property name="HAPartition"><inject bean="GoodStatePartition" state="Create"/></property>
- <depends>GoodStatePartition</depends>
- </bean>
<bean name="GoodStatePartition"
class="org.jboss.test.cluster.hapartition.state.StartupTestClusterPartition">
@@ -342,8 +326,6 @@
<!-- ClusterPartition requires a Cache for state management -->
<property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
- <!--property name="distributedState"><inject bean="DistributedState"/></property-->
-
<!-- Name of the partition being built -->
<property name="partitionName">GoodStatePartition</property>
@@ -366,7 +348,11 @@
</parameter>
</constructor>
- <property name="distributedReplicantManager"><inject bean="GoodStatePartitionDRM" state="Instantiated"/></property>
+ <property name="distributedReplicantManagerImpl">
+ <bean name="GoodStatePartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=GoodStatePartitionDRM,partitionName=GoodStatePartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+ </property>
<property name="startupRecorder"><inject bean="GoodStatePartitionRecorder"/></property>
Modified: trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml 2007-09-14 21:47:39 UTC (rev 65414)
+++ trunk/testsuite/src/resources/cluster/partition/partition-restart-beans.xml 2007-09-14 21:48:58 UTC (rev 65415)
@@ -83,29 +83,8 @@
<!-- ==================================================================== -->
<!-- DistributedState Service, a legacy wrapper around JBoss Cache -->
<!-- ==================================================================== -->
-
- <bean name="RestartDistributedState"
- class="org.jboss.ha.framework.server.DistributedStateImpl">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=RestartPartition", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation>
-
- <property name="clusteredCache"><inject bean="RestartPartition-HAPartitionCache" property="cache"/></property>
-
- </bean>
<!-- ==================================================================== -->
- <!-- DistributedReplicantManager Service -->
- <!-- ==================================================================== -->
- <bean name="RestartPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
-
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=RestartPartitionDRM,partitionName=RestartPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
-
- <property name="HAPartition"><inject bean="RestartPartition" state="Create"/></property>
- <depends>RestartPartition</depends>
-
- </bean>
-
- <!-- ==================================================================== -->
<!-- Cluster Partition: defines cluster -->
<!-- ==================================================================== -->
@@ -123,8 +102,6 @@
<!-- ClusterPartition requires a Cache for state management -->
<property name="clusteredCache"><inject bean="RestartPartition-HAPartitionCache" property="cache"/></property>
- <property name="distributedState"><inject bean="RestartDistributedState"/></property>
-
<!-- Name of the partition being built -->
<property name="partitionName">RestartPartition</property>
@@ -147,8 +124,20 @@
</parameter>
</constructor>
- <property name="distributedReplicantManager"><inject bean="RestartPartitionDRM" state="Instantiated"/></property>
+ <property name="distributedReplicantManagerImpl">
+ <bean name="RestartPartitionDRM" class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=RestartPartitionDRM,partitionName=RestartPartition", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+ </bean>
+ </property>
+ <property name="distributedStateImpl">
+ <bean name="RestartDistributedState"
+ class="org.jboss.ha.framework.server.DistributedStateImpl">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=RestartPartition", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation>
+ <property name="clusteredCache"><inject bean="RestartPartition-HAPartitionCache" property="cache"/></property>
+ </bean>
+ </property>
+
</bean>
More information about the jboss-cvs-commits
mailing list