[jboss-cvs] JBossAS SVN: r89190 - branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server.

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

Author: bstansberry at jboss.com
Date: 2009-05-20 10:23:56 -0400 (Wed, 20 May 2009)
New Revision: 89190

Modified:
   branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
   branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
Log:
[JBAS-6094] Go back to making DRM a separate component, as 2 MOs in same deployment with same name+nameType is problematic

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2009-05-20 14:22:50 UTC (rev 89189)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2009-05-20 14:23:56 UTC (rev 89190)
@@ -68,7 +68,6 @@
 import org.jboss.managed.api.annotation.ManagementComponent;
 import org.jboss.managed.api.annotation.ManagementObject;
 import org.jboss.managed.api.annotation.ManagementObjectID;
-import org.jboss.managed.api.annotation.ManagementObjectRef;
 import org.jboss.managed.api.annotation.ManagementOperation;
 import org.jboss.managed.api.annotation.ManagementProperties;
 import org.jboss.managed.api.annotation.ManagementProperty;
@@ -1745,12 +1744,12 @@
       return Version.description + "( " + Version.cvs + ")";
    }
    
-   @ManagementProperty(name="distributedReplicantManager", use={ViewUse.STATISTIC}, description="The DistributedReplicantManager")
-   @ManagementObjectRef(type="DistributedReplicantManager")
-   public String getDRMName()
-   {
-      return getPartitionName();
-   }
+//   @ManagementProperty(name="distributedReplicantManager", use={ViewUse.STATISTIC}, description="The DistributedReplicantManager")
+//   @ManagementObjectRef(type="DistributedReplicantManager")
+//   public String getDRMName()
+//   {
+//      return getPartitionName();
+//   }
    
    public DistributedReplicantManagerImpl getDistributedReplicantManagerImpl()
    {

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2009-05-20 14:22:50 UTC (rev 89189)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2009-05-20 14:23:56 UTC (rev 89190)
@@ -65,7 +65,8 @@
  * @author  <a href="mailto:pferraro at redhat.com">Paul Ferraro</a>
  * @version $Revision$
  */
- at ManagementObject(isRuntime=true, properties=ManagementProperties.EXPLICIT)
+ at ManagementObject(componentType=@ManagementComponent(type="MCBean", subtype="DistributedReplicantManager"),
+                  properties=ManagementProperties.EXPLICIT)
 public class DistributedReplicantManagerImpl
    implements DistributedReplicantManagerImplMBean,
               HAPartition.HAMembershipExtendedListener,
@@ -198,7 +199,7 @@
    }
    
    @ManagementProperty(use={ViewUse.STATISTIC}, description="The partition's name")
-   @ManagementObjectID(type="HAPartition")
+   @ManagementObjectID(type="DistributedReplicantManager")
    public String getPartitionName()
    {
       return this.partition.getPartitionName();