[jboss-cvs] JBossAS SVN: r87690 - in branches/Branch_5_x: cluster/src/main/org/jboss/ha/singleton and 1 other directories.

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

Author: pferraro
Date: 2009-04-22 16:35:57 -0400 (Wed, 22 Apr 2009)
New Revision: 87690

Modified:
   branches/Branch_5_x/cluster/src/main/org/jboss/ha/jmx/HAServiceMBeanSupport.java
   branches/Branch_5_x/cluster/src/main/org/jboss/ha/singleton/HASingletonSupport.java
   branches/Branch_5_x/testsuite/build.xml
Log:
Reverting JBAS-6792 fix - caused regression with distributed jmx notifications

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/ha/jmx/HAServiceMBeanSupport.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/ha/jmx/HAServiceMBeanSupport.java	2009-04-22 19:49:48 UTC (rev 87689)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/ha/jmx/HAServiceMBeanSupport.java	2009-04-22 20:35:57 UTC (rev 87690)
@@ -25,7 +25,6 @@
 
 import org.jboss.ha.framework.interfaces.HAService;
 import org.jboss.ha.framework.server.HAServiceImpl;
-import org.jboss.ha.framework.server.HAServiceRpcHandler;
 
 /**
  * Management Bean for an HA-Service.
@@ -48,7 +47,6 @@
  */
 public class HAServiceMBeanSupport
    extends AbstractHAServiceMBeanSupport<HAService<Notification>>
-   implements HAServiceRpcHandler<Notification>
 {
    /**
     * @see org.jboss.ha.jmx.AbstractHAServiceMBeanSupport#createHAService()
@@ -56,18 +54,7 @@
    @Override
    protected HAService<Notification> createHAService()
    {
-      return new HAServiceImpl<Notification>(this, this)
-      {
-         /**
-          * Expose HAServiceMBeanSupport subclass methods to rpc handler
-          * @see org.jboss.ha.framework.server.HAServiceImpl#getRpcHandler()
-          */
-         @Override
-         protected HAServiceRpcHandler<Notification> getRpcHandler()
-         {
-            return HAServiceMBeanSupport.this;
-         }
-      };
+      return new HAServiceImpl<Notification>(this, this);
    }
 }
 

Modified: branches/Branch_5_x/cluster/src/main/org/jboss/ha/singleton/HASingletonSupport.java
===================================================================
--- branches/Branch_5_x/cluster/src/main/org/jboss/ha/singleton/HASingletonSupport.java	2009-04-22 19:49:48 UTC (rev 87689)
+++ branches/Branch_5_x/cluster/src/main/org/jboss/ha/singleton/HASingletonSupport.java	2009-04-22 20:35:57 UTC (rev 87690)
@@ -26,9 +26,7 @@
 import org.jboss.ha.framework.interfaces.HASingleton;
 import org.jboss.ha.framework.interfaces.HASingletonElectionPolicy;
 import org.jboss.ha.framework.interfaces.HASingletonLifecycle;
-import org.jboss.ha.framework.server.HAServiceRpcHandler;
 import org.jboss.ha.framework.server.HASingletonImpl;
-import org.jboss.ha.framework.server.HASingletonRpcHandler;
 import org.jboss.ha.jmx.AbstractHAServiceMBeanSupport;
 
 
@@ -44,7 +42,7 @@
  */
 public class HASingletonSupport
    extends AbstractHAServiceMBeanSupport<HASingleton<Notification>>
-   implements HASingleton<Notification>, HASingletonRpcHandler<Notification>
+   implements HASingleton<Notification>
 {
    /**
     * @see org.jboss.ha.framework.interfaces.HASingletonMBean#isMasterNode()
@@ -127,25 +125,6 @@
    @Override
    protected HASingleton<Notification> createHAService()
    {
-      return new HASingletonImpl<Notification>(this, this, this)
-      {
-         /**
-          * Expose HASingletonSupport subclass methods to rpc handler
-          * @see org.jboss.ha.framework.server.HASingletonImpl#getRpcHandler()
-          */
-         @Override
-         protected HAServiceRpcHandler<Notification> getRpcHandler()
-         {
-            return HASingletonSupport.this;
-         }         
-      };
+      return new HASingletonImpl<Notification>(this, this, this);
    }
-
-   /**
-    * @see org.jboss.ha.framework.server.HASingletonRpcHandler#stopOldMaster()
-    */
-   public void stopOldMaster() throws Exception
-   {
-      ((HASingletonImpl<Notification>) this.getHAService()).stopOldMaster();
-   }
 }

Modified: branches/Branch_5_x/testsuite/build.xml
===================================================================
--- branches/Branch_5_x/testsuite/build.xml	2009-04-22 19:49:48 UTC (rev 87689)
+++ branches/Branch_5_x/testsuite/build.xml	2009-04-22 20:35:57 UTC (rev 87690)
@@ -922,7 +922,11 @@
    	<exclude name="org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakUnitTestCase.class" if="sun-vm"/>
    
       <!-- JBAS-6582, http://lists.jboss.org/pipermail/jboss-development/2008-December/013254.html -->
-      <exclude name="org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.class"/>	
+      <exclude name="org/jboss/test/ejb3/servlet/unit/ServletUnitTestCase.class"/>
+
+   	  <!-- JBAS-6792 fix temporarily reverted -->
+      <exclude name="org/jboss/test/cluster/defaultcfg/test/HAServiceUnitTestCase.class"/>
+      <exclude name="org/jboss/test/cluster/defaultcfg/test/HASingletonUnitTestCase.class"/>
    </patternset>
 
    <patternset id="aop-with-classloader.excludes">