[jboss-cvs] JBossAS SVN: r69348 - trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy.

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

Author: galder.zamarreno at jboss.com
Date: 2008-01-25 10:31:28 -0500 (Fri, 25 Jan 2008)
New Revision: 69348

Modified:
   trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml
Log:
[JBAS-4919] Fixed broken ha singleton election unit tests.

Modified: trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml	2008-01-25 15:25:31 UTC (rev 69347)
+++ trunk/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-electionpolicy-beans.xml	2008-01-25 15:31:28 UTC (rev 69348)
@@ -272,7 +272,7 @@
         <!-- The max amount of time (in milliseconds) we wait until the
             initial state (ie. the contents of the cache) are retrieved from
             existing members in a clustered environment -->
-        <property name="initialStateRetrievalTimeout">5000</property>
+        <property name="stateRetrievalTimeout">5000</property>
 
         <!-- Number of milliseconds to wait until all responses for a
             synchronous call have been received. -->
@@ -289,18 +289,14 @@
       <constructor factoryClass="org.jboss.cache.DefaultCacheFactory" factoryMethod="getInstance"/>
    </bean>
     
-   <!-- Now we use the above configuration to construct the cache itself -->
-   <bean name="ElectionPolicyTestCache" class="org.jboss.cache.CacheImpl">
+   <bean name="ElectionPolicyTestCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
+      
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache.test:service=ElectionPolicyTestCache", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="configuration"><inject bean="ElectionPolicyTestCacheConfig"/></property>
+        
+   </bean>
    
-      <depends>jboss:service=Naming</depends>
-      
-      <constructor factoryMethod="createCache">
-         <factory bean="ElectionPolicyTestCacheFactory"/>
-         <parameter class="org.jboss.cache.config.Configuration"><inject bean="ElectionPolicyTestCacheConfig"/></parameter>
-         <parameter class="boolean">false</parameter>
-      </constructor>
-      
-   </bean>
    
    <!-- ==================================================================== -->
    <!-- Partition used for testing failure to receive state                  -->
@@ -314,7 +310,7 @@
             <bean name="ElectionPolicyTestPartitionConfig" class="org.jboss.ha.framework.server.ClusterPartitionConfig">   
                
                <!-- ClusterPartition requires a Cache for state management -->
-               <property name="clusteredCache"><inject bean="ElectionPolicyTestCache"/></property>
+               <property name="clusteredCache"><inject bean="ElectionPolicyTestCache" property="cache"/></property>
                
                <!-- Name of the partition being built -->
                <property name="partitionName">ElectionPolicyTestPartition</property>