[jboss-cvs] JBossAS SVN: r107356 - branches/infinispan-int/cluster/src/etc.

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

Author: pferraro
Date: 2010-08-03 12:25:13 -0400 (Tue, 03 Aug 2010)
New Revision: 107356

Modified:
   branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml
Log:
Update with infinispan implementations.

Modified: branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml
===================================================================
--- branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml	2010-08-03 16:23:59 UTC (rev 107355)
+++ branches/infinispan-int/cluster/src/etc/hapartition-jboss-beans.xml	2010-08-03 16:25:13 UTC (rev 107356)
@@ -6,61 +6,59 @@
 
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
    
-   <!-- ==================================================================== -->
-   <!-- Cluster Partition: defines cluster                                   -->
-   <!-- ==================================================================== -->
-
-   <!-- 
-      HA services use a Cache for state management; this bean shields
-      HAPartition from having to directly use the JBoss Cache API.
-    -->
-   <bean name="HAPartitionCacheHandler"
-         class="org.jboss.ha.framework.server.HAPartitionCacheHandlerImpl">
-         <property name="cacheManager"><inject bean="CacheManager"/></property>
-         <property name="cacheConfigName">ha-partition</property>
-   </bean>
+  <!-- ==================================================================== -->
+  <!-- Cluster Partition: defines cluster                                   -->
+  <!-- ==================================================================== -->
+  
+  <!-- 
+    HA services use a Cache for state management; this bean shields
+    HAPartition from having to directly use the JBoss Cache API.
+  -->
+  <bean name="HAPartitionCacheHandler" class="org.jboss.ha.framework.server.ispn.HAPartitionCacheHandler">
+    <constructor>
+      <parameter><inject bean="CacheContainerRegistry"/></parameter>
+    </constructor>
+    <property name="cacheContainerName">ha-partition</property>
+  </bean>
    
-   <bean name="HAPartition"
-   		 class="org.jboss.ha.framework.server.ClusterPartition">     
+  <bean name="HAPartition" class="org.jboss.ha.framework.server.ClusterPartition">     
     	 
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)</annotation>
+    <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)</annotation>
+    
+    <property name="channelSource"><inject bean="HAPartitionCacheHandler"/></property>
       
-      <property name="channelSource"><inject bean="HAPartitionCacheHandler"/></property>
+    <!-- Name of the partition being built -->
+    <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
+       
+    <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
+    <property name="stateTransferTimeout">30000</property>
+            
+    <!-- Max time (in ms) to wait for RPC calls to complete. -->
+    <property name="methodCallTimeout">60000</property>
+    
+    <!-- Optionally provide a thread source to allow async connect of our channel -->
+    <property name="threadPool"><inject bean="LongRunningTasksThreadPool"/></property>
+    
+    <property name="distributedStateImpl">
+      <bean name="DistributedState" class="org.jboss.ha.framework.server.ispn.DistributedState">
+        <!--annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation-->
+        <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
+      </bean>
+    </property>
+
+    <!-- For legacy managed object interface support -->
+    <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
+    
+    <depends>jboss:service=Naming</depends>
       
-   	<!-- Name of the partition being built -->
-      <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
-         
-      <!-- Max time (in ms) to wait for state transfer to complete. Increase for large states -->
-      <property name="stateTransferTimeout">30000</property>
-              
-      <!-- Max time (in ms) to wait for RPC calls to complete. -->
-      <property name="methodCallTimeout">60000</property>
-      
-      <!-- Optionally provide a thread source to allow async connect of our channel -->
-      <property name="threadPool"><inject bean="LongRunningTasksThreadPool"/></property>
-      
-      <property name="distributedStateImpl">
-	      <bean name="DistributedState"
-	   		 class="org.jboss.ha.framework.server.DistributedStateImpl">	      
-	      	<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation>
-	      	<property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
-   		</bean>
-      </property>
-      
-      <!-- For legacy managed object interface support -->
-      <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
-      
-      <depends>jboss:service=Naming</depends>
-      
-   </bean>
+  </bean>
+  
+  <!--  Expose the DRM for management -->
+  <bean name="DistributedReplicantManager" class="org.jboss.ha.core.framework.server.DistributedReplicantManagerImpl">      
+    <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedReplicantManager,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.core.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+    <constructor factoryMethod="getDistributedReplicantManagerImpl">
+      <factory bean="HAPartition"/>
+    </constructor>
+  </bean>
    
-   <!--  Expose the DRM for management -->
-   <bean name="DistributedReplicantManager"
-         class="org.jboss.ha.core.framework.server.DistributedReplicantManagerImpl">      
-       <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedReplicantManager,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.core.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
-       <constructor factoryMethod="getDistributedReplicantManagerImpl">
-          <factory bean="HAPartition"/>
-       </constructor>
-   </bean>
-   
-</deployment>
+</deployment>
\ No newline at end of file