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

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

Author: jerrygauth
Date: 2007-06-27 14:24:31 -0400 (Wed, 27 Jun 2007)
New Revision: 63696

Modified:
   trunk/cluster/src/etc/cluster-beans.xml
   trunk/cluster/src/etc/deploy-hasingleton-beans.xml
Log:
JBAS-4032, restore jboss.partition.name property replacement in clustering beans.xml files

Modified: trunk/cluster/src/etc/cluster-beans.xml
===================================================================
--- trunk/cluster/src/etc/cluster-beans.xml	2007-06-27 17:55:20 UTC (rev 63695)
+++ trunk/cluster/src/etc/cluster-beans.xml	2007-06-27 18:24:31 UTC (rev 63696)
@@ -74,8 +74,7 @@
     
    <!-- Add a handle to the cache to JMX -->
    <bean name="DefaultPartition-HAPartitionCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
-      <!-- FIXME restore the property replacement on the partition name once JBMICROCONT-143 is fixed -->
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=HAPartitionCache,partitionName=DefaultPartition", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=HAPartitionCache,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
       
       <property name="configuration"><inject bean="DefaultPartition-HAPartitionCacheConfig"/></property>
         
@@ -88,8 +87,7 @@
    <bean name="DistributedState"
    		 class="org.jboss.ha.framework.server.DistributedStateImpl">
       
-      <!-- FIXME restore the property replacement on the partition name once JBMICROCONT-143 is fixed -->
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DistributedState,partitionName=DefaultPartition", exposedInterface=org.jboss.ha.framework.server.DistributedStateImplMBean.class, registerDirectly=true)</annotation>
+      <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>
@@ -103,8 +101,7 @@
    <bean name="HAPartition"
    		 class="org.jboss.ha.framework.server.ClusterPartition">     
    		 
-   	<!-- FIXME restore the property replacement on the partition name once JBMICROCONT-143 is fixed -->
-    <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=DefaultPartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class)</annotation>
+    <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>
    	   <parameter>

Modified: trunk/cluster/src/etc/deploy-hasingleton-beans.xml
===================================================================
--- trunk/cluster/src/etc/deploy-hasingleton-beans.xml	2007-06-27 17:55:20 UTC (rev 63695)
+++ trunk/cluster/src/etc/deploy-hasingleton-beans.xml	2007-06-27 18:24:31 UTC (rev 63696)
@@ -16,8 +16,7 @@
    -->
    <bean name="HASingletonDeploymentScanner" class="org.jboss.ha.singleton.HASingletonDeploymentScanner">
       
-      <!-- FIXME restore the property replacement on the partition name once JBMICROCONT-143 is fixed -->
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASingletonDeploymentScanner,partitionName=DefaultPartition", exposedInterface=org.jboss.ha.singleton.HASingletonDeploymentScannerMBean.class, registerDirectly=true)</annotation>
+      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HASingletonDeploymentScanner,partitionName=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.singleton.HASingletonDeploymentScannerMBean.class, registerDirectly=true)</annotation>
          
       <property name="profileService"><inject bean="ProfileService"/></property>
       <property name="filterInstance"><inject bean="DeploymentFilter"/></property>