[jboss-cvs] JBossAS SVN: r85585 - 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-03-06 21:10:40 -0500 (Fri, 06 Mar 2009)
New Revision: 85585

Modified:
   branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java
Log:
[JBAS-6094] Treat DRM as part of the HAPartition managed object

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-03-07 02:09:03 UTC (rev 85584)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/ha/framework/server/DistributedReplicantManagerImpl.java	2009-03-07 02:10:40 UTC (rev 85585)
@@ -65,8 +65,7 @@
  * @author  <a href="mailto:pferraro at redhat.com">Paul Ferraro</a>
  * @version $Revision$
  */
- at ManagementObject(componentType=@ManagementComponent(type="MCBean", subtype="DistributedReplicantManager"),
-      properties=ManagementProperties.EXPLICIT)
+ at ManagementObject(isRuntime=true, properties=ManagementProperties.EXPLICIT)
 public class DistributedReplicantManagerImpl
    implements DistributedReplicantManagerImplMBean,
               HAPartition.HAMembershipExtendedListener,
@@ -199,7 +198,7 @@
    }
    
    @ManagementProperty(use={ViewUse.STATISTIC}, description="The partition's name")
-   @ManagementObjectID(type="DistributedReplicantManager")
+   @ManagementObjectID(type="HAPartition")
    public String getPartitionName()
    {
       return this.partition.getPartitionName();
@@ -210,8 +209,9 @@
 //      this.partition = clusterPartition;
 //   }
    
-   @ManagementOperation(description="List all known keys and the nodes that have registered bindings",
-                        impact=Impact.ReadOnly)
+   @ManagementOperation(name="listDRMContent",
+         description="List all known keys and the nodes that have registered bindings",
+         impact=Impact.ReadOnly)
    public String listContent() throws Exception
    {
       StringBuilder result = new StringBuilder();
@@ -255,7 +255,8 @@
       return result.toString();
    }
    
-   @ManagementOperation(description="List in XML format all known services and the nodes that have registered bindings",
+   @ManagementOperation(name="listDRMContentAsXml",
+         description="List in XML format all known services and the nodes that have registered bindings",
          impact=Impact.ReadOnly)
    public String listXmlContent() throws Exception
    {
@@ -349,9 +350,9 @@
       new MembersPublisher().start();
    }
       
-   @ManagementOperation(description="Get a collection of the names of all keys" +
-   		                             " for which we have bindings",
-                        impact=Impact.ReadOnly)
+   @ManagementOperation(name="getAllDRMServices",
+         description="Get a collection of the names of all keys for which we have bindings",
+         impact=Impact.ReadOnly)
    public Collection<String> getAllServices()
    {
       Set<String> services = new HashSet<String>();
@@ -525,8 +526,8 @@
    }
    
    @Deprecated
-   @ManagementOperation(description="Returns the names of the nodes that have " +
-   		                            " registered objects under the given key",
+   @ManagementOperation(name="lookupDRMNodeNames",
+         description="Returns the names of the nodes that have registered objects under the given key",
                         impact=Impact.ReadOnly,
                         params={@ManagementParameter(name="key",
                                                      description="The name of the service")})
@@ -598,7 +599,8 @@
       }
    }
    
-   @ManagementOperation(description="Returns a hash of the list of nodes that " +
+   @ManagementOperation(name="getDRMServiceViewId",
+         description="Returns a hash of the list of nodes that " +
    		                            "have registered an object for the given key",
    		                impact=Impact.ReadOnly,
                         params={@ManagementParameter(name="key",
@@ -610,6 +612,10 @@
       return (result != null) ? result.intValue() : 0;
    }
    
+   @ManagementOperation(name="isDRMMasterForService",
+         description="Returns whether the DRM considers this node to be the master for the given service",
+         impact=Impact.ReadOnly,
+         params={@ManagementParameter(name="key", description="The name of the service")})
    public boolean isMasterReplica(String key)
    {
       if (this.log.isTraceEnabled())