[jboss-cvs] JBossAS SVN: r81808 - in trunk: cluster/src/etc and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sat Nov 29 10:28:48 EST 2008


Author: bstansberry at jboss.com
Date: 2008-11-29 10:28:47 -0500 (Sat, 29 Nov 2008)
New Revision: 81808

Added:
   trunk/cluster/src/etc/hapartition-jboss-beans.xml
Removed:
   trunk/cluster/src/etc/cluster-jboss-beans.xml
Modified:
   trunk/build/build-distr.xml
Log:
[JBAS-6261] Rename cluster-jboss-beans.xml to hapartition-jboss-beans.xml

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-11-29 14:38:05 UTC (rev 81807)
+++ trunk/build/build-distr.xml	2008-11-29 15:28:47 UTC (rev 81808)
@@ -973,7 +973,7 @@
     <mkdir dir="${install.server}/all/deploy/cluster"/>
     <copy todir="${install.server}/all/deploy/cluster" filtering="no">
       <fileset dir="${_module.output}/etc">
-        <include name="cluster-jboss-beans.xml"/>
+        <include name="hapartition-jboss-beans.xml"/>
         <include name="deploy-hasingleton-jboss-beans.xml"/>
         <include name="hajndi-jboss-beans.xml"/>
         <include name="ha-legacy-jboss-beans.xml"/>

Deleted: trunk/cluster/src/etc/cluster-jboss-beans.xml
===================================================================
--- trunk/cluster/src/etc/cluster-jboss-beans.xml	2008-11-29 14:38:05 UTC (rev 81807)
+++ trunk/cluster/src/etc/cluster-jboss-beans.xml	2008-11-29 15:28:47 UTC (rev 81808)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ==================================================================== -->
-<!-- Core HAParition Service Used for intra-cluster group RPCs            -->
-<!-- ==================================================================== -->
-
-<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>
-   
-   <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=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)</annotation>
-      
-   	<!-- ClusterPartition requires a Cache for state management -->
-      <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
-               
-      <!-- Name of the partition being built -->
-      <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
-         
-      <!-- The address used to determine the node name -->
-      <property name="nodeAddress">${jboss.bind.address}</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="jboss.system:service=ThreadPool"/></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>
-      
-   </bean>
-   
-   <!--  Expose the DRM for management -->
-   <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>
-       <constructor factoryMethod="getDistributedReplicantManagerImpl">
-          <factory bean="HAPartition"/>
-       </constructor>
-   </bean>
-   
-</deployment>

Copied: trunk/cluster/src/etc/hapartition-jboss-beans.xml (from rev 81806, trunk/cluster/src/etc/cluster-jboss-beans.xml)
===================================================================
--- trunk/cluster/src/etc/hapartition-jboss-beans.xml	                        (rev 0)
+++ trunk/cluster/src/etc/hapartition-jboss-beans.xml	2008-11-29 15:28:47 UTC (rev 81808)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ==================================================================== -->
+<!-- Core HAParition Service Used for intra-cluster group RPCs            -->
+<!-- ==================================================================== -->
+
+<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>
+   
+   <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=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true)</annotation>
+      
+   	<!-- ClusterPartition requires a Cache for state management -->
+      <property name="cacheHandler"><inject bean="HAPartitionCacheHandler"/></property>
+               
+      <!-- Name of the partition being built -->
+      <property name="partitionName">${jboss.partition.name:DefaultPartition}</property>
+         
+      <!-- The address used to determine the node name -->
+      <property name="nodeAddress">${jboss.bind.address}</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="jboss.system:service=ThreadPool"/></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>
+      
+   </bean>
+   
+   <!--  Expose the DRM for management -->
+   <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>
+       <constructor factoryMethod="getDistributedReplicantManagerImpl">
+          <factory bean="HAPartition"/>
+       </constructor>
+   </bean>
+   
+</deployment>


Property changes on: trunk/cluster/src/etc/hapartition-jboss-beans.xml
___________________________________________________________________
Name: svn:mergeinfo
   + 




More information about the jboss-cvs-commits mailing list