[jboss-cvs] JBossAS SVN: r65412 - trunk/cluster/src/etc.

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

Author: bstansberry at jboss.com
Date: 2007-09-14 17:44:04 -0400 (Fri, 14 Sep 2007)
New Revision: 65412

Modified:
   trunk/cluster/src/etc/cluster-beans.xml
Log:
[JBAS-4724] DRM lifecycle must be controlled by ClusterPartition
[JBAS-4726] DistributedStateImpl does not subclass ServiceMBeanSupport
Don't inject DS via the config object
Don't use deprecated JBC config attribute

Modified: trunk/cluster/src/etc/cluster-beans.xml
===================================================================
--- trunk/cluster/src/etc/cluster-beans.xml	2007-09-14 21:43:26 UTC (rev 65411)
+++ trunk/cluster/src/etc/cluster-beans.xml	2007-09-14 21:44:04 UTC (rev 65412)
@@ -59,7 +59,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. -->
@@ -81,38 +81,14 @@
    </bean>
 
    <!-- ==================================================================== -->
-   <!-- DistributedState Service, a legacy wrapper around JBoss Cache        -->
-   <!-- ==================================================================== -->
-
-   <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="clusteredCache"><inject bean="DefaultPartition-HAPartitionCache" property="cache"/></property>
-      
-   </bean>
-
-   <!-- ==================================================================== -->
-   <!-- DistributedReplicantManager Service                                                                              -->
-   <!-- ==================================================================== -->
-
-   <bean name="DistributedReplicantManager"
-   		 class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">
-      
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedReplicantManager,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
-      	       
-      <property name="HAPartition"><inject bean="HAPartition" state="Create"/></property>
-      <depends>HAPartition</depends>
-      
-   </bean>
-   <!-- ==================================================================== -->
    <!-- Cluster Partition: defines cluster                                   -->
    <!-- ==================================================================== -->
 
    <bean name="HAPartition"
    		 class="org.jboss.ha.framework.server.ClusterPartition">     
-   		 
+
+    <depends>jboss:service=Naming</depends>
+    	 
     <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
       
    	<constructor>
@@ -122,8 +98,6 @@
                <!-- ClusterPartition requires a Cache for state management -->
                <property name="clusteredCache"><inject bean="DefaultPartition-HAPartitionCache" property="cache"/></property>
           
-               <property name="distributedState"><inject bean="DistributedState"/></property>
-                
                <!-- Name of the partition being built -->
                <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
          
@@ -140,14 +114,26 @@
                <property name="stateTransferTimeout">30000</property>
               
                <!-- Max time (in ms) to wait for RPC calls to complete. -->
-               <property name="methodCallTimeout">60000</property>            
-               
+               <property name="methodCallTimeout">60000</property>    
+              
             </bean>
          </parameter>
       </constructor>
       
-      <property name="distributedReplicantManager"><inject bean="DistributedReplicantManager" state="Instantiated"/></property>
+      <property name="distributedReplicantManagerImpl">
+         <bean name="DistributedReplicantManager"
+   		    class="org.jboss.ha.framework.server.DistributedReplicantManagerImpl">      
+            <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedReplicantManager,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.DistributedReplicantManagerImplMBean.class, registerDirectly=true)</annotation>
+         </bean>
+      </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>	               
+   		</bean>
+      </property>
+      
    </bean>