[jboss-cvs] JBossAS SVN: r62085 - in branches/Branch_4_0/cluster/src: main/org/jboss/ha/singleton and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 4 12:50:03 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-04-04 12:50:03 -0400 (Wed, 04 Apr 2007)
New Revision: 62085
Added:
branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java
Modified:
branches/Branch_4_0/cluster/src/etc/deploy-hasingleton-service.xml
branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java
branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java
Log:
[JBAS-4262] Just go the simple StandardMBean route
Modified: branches/Branch_4_0/cluster/src/etc/deploy-hasingleton-service.xml
===================================================================
--- branches/Branch_4_0/cluster/src/etc/deploy-hasingleton-service.xml 2007-04-04 16:46:17 UTC (rev 62084)
+++ branches/Branch_4_0/cluster/src/etc/deploy-hasingleton-service.xml 2007-04-04 16:50:03 UTC (rev 62085)
@@ -16,8 +16,7 @@
| Use the deployer service on the singleton node.
|
-->
- <mbean code="org.jboss.ha.singleton.HASingletonController"
- interface="org.jboss.ha.singleton.RestartOnMergeSingletonController"
+ <mbean code="org.jboss.ha.singleton.RestartOnMergeHASingletonController"
name="jboss.ha:service=HASingletonDeployer">
<!-- We now inject the partition into the HAJNDI service instead
of requiring that the partition name be passed -->
Modified: branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java
===================================================================
--- branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java 2007-04-04 16:46:17 UTC (rev 62084)
+++ branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/HASingletonController.java 2007-04-04 16:50:03 UTC (rev 62085)
@@ -48,7 +48,7 @@
* @version $Revision$
*/
public class HASingletonController extends HASingletonSupport
- implements RestartOnMergeHASingletonController
+ implements HASingletonControllerMBean
{
// Private Data --------------------------------------------------
Modified: branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java
===================================================================
--- branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java 2007-04-04 16:46:17 UTC (rev 62084)
+++ branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java 2007-04-04 16:50:03 UTC (rev 62085)
@@ -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/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java (from rev 61872, branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonController.java)
===================================================================
--- branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java (rev 0)
+++ branches/Branch_4_0/cluster/src/main/org/jboss/ha/singleton/RestartOnMergeHASingletonControllerMBean.java 2007-04-04 16:50:03 UTC (rev 62085)
@@ -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);
+
+}
More information about the jboss-cvs-commits
mailing list