[jboss-cvs] JBossAS SVN: r62084 - branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton.

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

Author: bstansberry at jboss.com
Date: 2007-04-04 12:46:17 -0400 (Wed, 04 Apr 2007)
New Revision: 62084

Added:
   branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java
Modified:
   branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java
   branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java
Log:
[ASPATCH-179] Just go the simple StandardMBean route

Modified: branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java	2007-04-04 16:40:11 UTC (rev 62083)
+++ branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java	2007-04-04 16:46:17 UTC (rev 62084)
@@ -27,7 +27,7 @@
  */
 public class HASingletonController
    extends HASingletonSupport
-   implements RestartOnMergeHASingletonController
+   implements HASingletonControllerMBean
 {
 
    // -------------------------------------------------------------------------

Modified: branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java	2007-04-04 16:40:11 UTC (rev 62083)
+++ branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java	2007-04-04 16:46:17 UTC (rev 62084)
@@ -1,42 +1,40 @@
-/**
- * 
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 package org.jboss.ha.singleton;
 
 /**
- * Extends HASingletonControllerMBean to expose configuration of the
- * <code>restartOnMerge</code> property.
+ * {@link HASingletonController} subclass that exposes the
+ * {@link #getRestartOnMerge() restartOnMerge}
+ * property via its MBean interface.
  * 
  * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  * @version $Revision: 1.1 $
+ * 
+ * @deprecated This class will be removed in 4.2.0 and later as
+ *             the restartOnMerge property is exposed in HASingletonControllerMBean
  */
-public interface RestartOnMergeHASingletonController extends HASingletonControllerMBean
+public class RestartOnMergeHASingletonController extends HASingletonController
+      implements
+         RestartOnMergeHASingletonControllerMBean
 {
 
-   /**
-    * Gets whether this singleton will stop and restart itself if it is the
-    * master and a cluster merge occurs.
-    * <p/>
-    * A restart allows the service to reset any state that may
-    * have gotten out-of-sync with the rest of the cluster while
-    * the just-merged split was in effect.
-    * 
-    * @return <code>true</code> if a restart will occur, <code>false</code>
-    *         otherwise
-    */
-   boolean getRestartOnMerge();
-
-   /**
-    * Sets whether this singleton will stop and restart itself if it is the
-    * master and a cluster merge occurs?
-    * <p/>
-    * A restart allows the service to reset any state that may
-    * have gotten out-of-sync with the rest of the cluster while
-    * the just-merged split was in effect.
-    * 
-    * @param restartOnMerge <code>true</code> if a restart should occur, 
-    *                       <code>false</code> otherwise
-    */
-   void setRestartOnMerge(boolean restartOnMerge);
-
 }

Copied: branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java (from rev 61877, branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java)
===================================================================
--- branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java	                        (rev 0)
+++ branches/JBoss_4_0_3_SP1_CP/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java	2007-04-04 16:46:17 UTC (rev 62084)
@@ -0,0 +1,45 @@
+/**
+ * 
+ */
+package org.jboss.ha.singleton;
+
+/**
+ * Extends HASingletonControllerMBean to expose configuration of the
+ * <code>restartOnMerge</code> property.
+ * 
+ * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
+ * @version $Revision: 1.1 $
+ * 
+ * @deprecated This interface will be removed in 4.2.0 and later as
+ *             the restartOnMerge property is exposed in HASingletonControllerMBean
+ */
+public interface RestartOnMergeHASingletonControllerMBean extends HASingletonControllerMBean
+{
+
+   /**
+    * Gets whether this singleton will stop and restart itself if it is the
+    * master and a cluster merge occurs.
+    * <p/>
+    * A restart allows the service to reset any state that may
+    * have gotten out-of-sync with the rest of the cluster while
+    * the just-merged split was in effect.
+    * 
+    * @return <code>true</code> if a restart will occur, <code>false</code>
+    *         otherwise
+    */
+   boolean getRestartOnMerge();
+
+   /**
+    * Sets whether this singleton will stop and restart itself if it is the
+    * master and a cluster merge occurs?
+    * <p/>
+    * A restart allows the service to reset any state that may
+    * have gotten out-of-sync with the rest of the cluster while
+    * the just-merged split was in effect.
+    * 
+    * @param restartOnMerge <code>true</code> if a restart should occur, 
+    *                       <code>false</code> otherwise
+    */
+   void setRestartOnMerge(boolean restartOnMerge);
+
+}