[jboss-cvs] JBossAS SVN: r63401 - trunk/testsuite/src/resources/cluster/partition.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-06-07 17:27:26 -0400 (Thu, 07 Jun 2007)
New Revision: 63401

Modified:
   trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
Log:
[JBAS-4475]Convert JGroups multiplexer service to a -beans.xml
Add missing @JMX annotations; the test client needs to access via JMX

Modified: trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml	2007-06-07 21:25:54 UTC (rev 63400)
+++ trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml	2007-06-07 21:27:26 UTC (rev 63401)
@@ -22,7 +22,7 @@
         <property name="runtimeConfig">
            <bean name="BadHAPartitionCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
               <property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="TransactionManager"/></property>
-              <property name="muxChannelFactory"><inject bean="jgroups.mux:name=Multiplexer"/></property>
+              <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
            </bean>
         </property>
         
@@ -139,8 +139,10 @@
    
    <bean name="BadHAPartitionStateTransfer,returnState=false"
          class="org.jboss.test.cluster.partition.BadHAPartitionStateTransfer">
+         
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=BadHAPartitionStateTransfer,returnState=false", exposedInterface=org.jboss.test.cluster.partition.BadHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>       
       
-      <property name="clusterPartition">BadProviderPartition</property>
+      <property name="clusterPartition"><inject bean="BadProviderPartition"/></property>
          
       <property name="returnState">false</property>
       
@@ -175,7 +177,7 @@
                <property name="nodeAddress">${jboss.bind.address}</property>
          
                <!-- Inject the naming service port as an aid in creating a nodeUniqueId.  Not needed if nodeUniqueId is set -->
-               <property name="namingServicePort"><inject bean="jboss:service=Naming" property="port"/></property>
+               <property name="namingServicePort"><inject bean="jboss:service=Naming" property="Port"/></property>
                
                <!-- Determine if deadlock detection is enabled -->
                <property name="deadlockDetection">false</property>
@@ -197,7 +199,9 @@
    <bean name="BadHAPartitionStateTransfer,returnState=true"
          class="org.jboss.test.cluster.partition.BadHAPartitionStateTransfer">
       
-      <property name="clusterPartition">BadStatePartition</property>
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=BadHAPartitionStateTransfer,returnState=true", exposedInterface=org.jboss.test.cluster.partition.BadHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>       
+      
+      <property name="clusterPartition"><inject bean="BadStatePartition"/></property>
          
       <property name="returnState">true</property>
       
@@ -302,8 +306,10 @@
    <bean name="CustomStateHAPartitionStateTransfer"
          class="org.jboss.test.cluster.partition.CustomStateHAPartitionStateTransfer">
       
-      <property name="clusterPartition">GoodStatePartition</property>
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.ha:service=CustomStateHAPartitionStateTransfer", exposedInterface=org.jboss.test.cluster.partition.CustomStateHAPartitionStateTransferMBean.class, registerDirectly=true)</annotation>       
       
+      <property name="clusterPartition"><inject bean="GoodStatePartition"/></property>
+      
    </bean>
 
 </deployment>