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

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

Author: bstansberry at jboss.com
Date: 2008-01-22 18:52:54 -0500 (Tue, 22 Jan 2008)
New Revision: 69227

Modified:
   trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
Log:
DefaultCacheFactory no longer creates CacheImpl

Modified: trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml	2008-01-22 23:45:22 UTC (rev 69226)
+++ trunk/testsuite/src/resources/cluster/partition/jboss-beans.xml	2008-01-22 23:52:54 UTC (rev 69227)
@@ -61,25 +61,16 @@
         
         <property name="exposeManagementStatistics">true</property>
 
-    </bean>
-   
-   <bean name="HAPartitionStateTransferTestCacheFactory" class ="org.jboss.cache.DefaultCacheFactory">
-      <constructor factoryClass="org.jboss.cache.DefaultCacheFactory" factoryMethod="getInstance"/>
+    </bean>
+    
+   <!-- Add a handle to the cache to JMX -->
+   <bean name="HAPartitionStateTransferTestCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=HAPartitionCache,partitionName=HAPartitionStateTransferTest", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+      
+      <property name="configuration"><inject bean="HAPartitionStateTransferTestCacheConfig"/></property>
+        
    </bean>
    
-   <!-- Now we use the above configuration to construct the cache itself -->
-   <bean name="HAPartitionStateTransferTestCache" class="org.jboss.cache.CacheImpl">
-   
-      <depends>jboss:service=Naming</depends>
-      
-      <constructor factoryMethod="createCache">
-         <factory bean="HAPartitionStateTransferTestCacheFactory"/>
-         <parameter class="org.jboss.cache.config.Configuration"><inject bean="HAPartitionStateTransferTestCacheConfig"/></parameter>
-         <parameter class="boolean">false</parameter>
-      </constructor>
-      
-   </bean>
-   
    <!-- ==================================================================== -->
    <!-- Partition used for testing failure to receive state                  -->
    <!-- ==================================================================== -->
@@ -102,7 +93,7 @@
             <bean name="BadProviderPartitionConfig" class="org.jboss.ha.framework.server.ClusterPartitionConfig">   
                
                <!-- ClusterPartition requires a Cache for state management -->
-               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
+               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache" property="cache"/></property>
                
                <!-- Name of the partition being built -->
                <property name="partitionName">BadProviderPartition</property>
@@ -181,7 +172,7 @@
             <bean name="BadStatePartitionConfig" class="org.jboss.ha.framework.server.ClusterPartitionConfig">   
                
                <!-- ClusterPartition requires a Cache for state management -->
-               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
+               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache" property="cache"/></property>
                 
                <!-- Name of the partition being built -->
                <property name="partitionName">BadStatePartition</property>
@@ -256,7 +247,7 @@
             <bean name="NoStatePartitionConfig" class="org.jboss.ha.framework.server.ClusterPartitionConfig">   
                
                <!-- ClusterPartition requires a Cache for state management -->
-               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
+               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache" property="cache"/></property>
                
                <!-- Name of the partition being built -->
                <property name="partitionName">NoStatePartition</property>
@@ -315,7 +306,7 @@
             <bean name="GoodStatePartitionConfig" class="org.jboss.ha.framework.server.ClusterPartitionConfig">   
                
                <!-- ClusterPartition requires a Cache for state management -->
-               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache"/></property>
+               <property name="clusteredCache"><inject bean="HAPartitionStateTransferTestCache" property="cache"/></property>
                
                <!-- Name of the partition being built -->
                <property name="partitionName">GoodStatePartition</property>
@@ -349,8 +340,6 @@
       
       <property name="stateTransferTargets">
          <list>
-           <!--inject bean="SimpleHAPartitionStateTransfer" state="Configured"/>
-           <inject bean="CustomStateHAPartitionStateTransfer" state="Configured"/-->
            <inject bean="SimpleHAPartitionStateTransfer" state="Configured"/>
            <inject bean="CustomStateHAPartitionStateTransfer" state="Configured"/>
          </list>