[jboss-cvs] JBossAS SVN: r94907 - trunk/cluster/src/main/java/org/jboss/ha/jmx.

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

Author: bstansberry at jboss.com
Date: 2009-10-14 20:59:26 -0400 (Wed, 14 Oct 2009)
New Revision: 94907

Modified:
   trunk/cluster/src/main/java/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java
   trunk/cluster/src/main/java/org/jboss/ha/jmx/HAServiceMBean.java
Log:
[JBAS-6797] Remove callMethodOnPartition from public API, MBean interface
Get rid of deprecated setClusterPartition

Modified: trunk/cluster/src/main/java/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java	2009-10-15 00:55:57 UTC (rev 94906)
+++ trunk/cluster/src/main/java/org/jboss/ha/jmx/AbstractHAServiceMBeanSupport.java	2009-10-15 00:59:26 UTC (rev 94907)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009 Red Hat, Inc. and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -82,14 +82,6 @@
       this.service.setHAPartition(partition);
    }
 
-   public void setClusterPartition(ClusterPartitionMBean clusterPartition)
-   {
-      if ((this.getState() != STARTED) && (this.getState() != STARTING))
-      {
-         this.service.setHAPartition(clusterPartition.getHAPartition());
-      }
-   }
-
    @ManagementProperty(use={ViewUse.STATISTIC}, description="The name of the HAPartition this service is associated with")
    public String getPartitionName()
    {
@@ -233,7 +225,7 @@
    }
 
    @SuppressWarnings("unchecked")
-   public List callMethodOnPartition(String methodName, Object[] args, Class[] types) throws Exception
+   protected List callMethodOnPartition(String methodName, Object[] args, Class[] types) throws Exception
    {
       return this.getHAPartition().callMethodOnCluster(this.getHAServiceKey(), methodName, args, types, true);
    }

Modified: trunk/cluster/src/main/java/org/jboss/ha/jmx/HAServiceMBean.java
===================================================================
--- trunk/cluster/src/main/java/org/jboss/ha/jmx/HAServiceMBean.java	2009-10-15 00:55:57 UTC (rev 94906)
+++ trunk/cluster/src/main/java/org/jboss/ha/jmx/HAServiceMBean.java	2009-10-15 00:59:26 UTC (rev 94907)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2009 Red Hat, Inc. and individual contributors
  * as indicated by the @author tags. See the copyright.txt file in the
  * distribution for a full listing of individual contributors.
  *
@@ -22,13 +22,11 @@
 package org.jboss.ha.jmx;
 
 import java.io.Serializable;
-import java.util.List;
 
 import javax.management.Notification;
 import javax.management.NotificationBroadcaster;
 
 import org.jboss.ha.framework.interfaces.HAPartition;
-import org.jboss.ha.framework.server.ClusterPartitionMBean;
 
 /**
  * <p>
@@ -58,36 +56,9 @@
     * @param clusterPartition the partition
     */
    void setHAPartition(HAPartition clusterPartition);
- 
-   /**
-    * Sets the underlying partition used by this service.
-    * 
-    * @param clusterPartition the partition
-    * 
-    * @deprecated use {@link #setHAPartition(HAPartition)}
-    */
-   void setClusterPartition(ClusterPartitionMBean clusterPartition);
 
    /**
     * 
-    * Convenience method for broadcasting a call to all members of a partition.
-    * 
-    * @param methodName
-    * @param args array of Java Object representing the set of parameters to be
-    * given to the remote method
-    * @param types The types of the parameters
-    * @return a list of responses from remote nodes
-    * @throws Exception
-    * 
-    * @deprecated does not belong in this general purpose API; will be removed in AS 6;
-    *             subinterfaces that wish to expose this operation can add it 
-    */
-   @Deprecated
-   @SuppressWarnings("unchecked")
-   List callMethodOnPartition(String methodName, Object[] args, Class[] types) throws Exception;
-
-   /**
-    * 
     * Convenience method for sharing state across a cluster partition.
     * Delegates to the DistributedStateService
     *