You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/10/31 00:13:55 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans MBeanUtils.java ServerLifecycleListener.java
craigmcc 01/10/30 15:13:55
Modified: catalina/src/share/org/apache/catalina/mbeans
MBeanUtils.java ServerLifecycleListener.java
Log:
Update MBean removal to reflect looking up the appropriate MBean domain.
Revision Changes Path
1.3 +136 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Index: MBeanUtils.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MBeanUtils.java 2001/10/30 17:39:49 1.2
+++ MBeanUtils.java 2001/10/30 23:13:55 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v 1.2 2001/10/30 17:39:49 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/10/30 17:39:49 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java,v 1.3 2001/10/30 23:13:55 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/10/30 23:13:55 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.2 $ $Date: 2001/10/30 17:39:49 $
+ * @version $Revision: 1.3 $ $Date: 2001/10/30 23:13:55 $
*/
public class MBeanUtils {
@@ -499,6 +499,138 @@
}
}
return (mserver);
+
+ }
+
+
+ /**
+ * Deregister the MBean for this
+ * <code>Connector</code> object.
+ *
+ * @param connector The Connector to be managed
+ *
+ * @exception Exception if an MBean cannot be deregistered
+ */
+ public static void destroyMBean(Connector connector)
+ throws Exception {
+
+ String mname = createManagedName(connector);
+ ManagedBean managed = registry.findManagedBean(mname);
+ String domain = managed.getDomain();
+ if (domain == null)
+ domain = mserver.getDefaultDomain();
+ ObjectName oname = createObjectName(domain, connector);
+ mserver.unregisterMBean(oname);
+
+ }
+
+
+ /**
+ * Deregister the MBean for this
+ * <code>Context</code> object.
+ *
+ * @param context The Context to be managed
+ *
+ * @exception Exception if an MBean cannot be deregistered
+ */
+ public static void destroyMBean(Context context)
+ throws Exception {
+
+ String mname = createManagedName(context);
+ ManagedBean managed = registry.findManagedBean(mname);
+ String domain = managed.getDomain();
+ if (domain == null)
+ domain = mserver.getDefaultDomain();
+ ObjectName oname = createObjectName(domain, context);
+ mserver.unregisterMBean(oname);
+
+ }
+
+
+ /**
+ * Deregister the MBean for this
+ * <code>Engine</code> object.
+ *
+ * @param engine The Engine to be managed
+ *
+ * @exception Exception if an MBean cannot be deregistered
+ */
+ public static void destroyMBean(Engine engine)
+ throws Exception {
+
+ String mname = createManagedName(engine);
+ ManagedBean managed = registry.findManagedBean(mname);
+ String domain = managed.getDomain();
+ if (domain == null)
+ domain = mserver.getDefaultDomain();
+ ObjectName oname = createObjectName(domain, engine);
+ mserver.unregisterMBean(oname);
+
+ }
+
+
+ /**
+ * Deregister the MBean for this
+ * <code>Host</code> object.
+ *
+ * @param host The Host to be managed
+ *
+ * @exception Exception if an MBean cannot be deregistered
+ */
+ public static void destroyMBean(Host host)
+ throws Exception {
+
+ String mname = createManagedName(host);
+ ManagedBean managed = registry.findManagedBean(mname);
+ String domain = managed.getDomain();
+ if (domain == null)
+ domain = mserver.getDefaultDomain();
+ ObjectName oname = createObjectName(domain, host);
+ mserver.unregisterMBean(oname);
+
+ }
+
+
+ /**
+ * Deregister the MBean for this
+ * <code>Server</code> object.
+ *
+ * @param server The Server to be managed
+ *
+ * @exception Exception if an MBean cannot be deregistered
+ */
+ public static void destroyMBean(Server server)
+ throws Exception {
+
+ String mname = createManagedName(server);
+ ManagedBean managed = registry.findManagedBean(mname);
+ String domain = managed.getDomain();
+ if (domain == null)
+ domain = mserver.getDefaultDomain();
+ ObjectName oname = createObjectName(domain, server);
+ mserver.unregisterMBean(oname);
+
+ }
+
+
+ /**
+ * Deregister the MBean for this
+ * <code>Service</code> object.
+ *
+ * @param service The Service to be managed
+ *
+ * @exception Exception if an MBean cannot be deregistered
+ */
+ public static void destroyMBean(Service service)
+ throws Exception {
+
+ String mname = createManagedName(service);
+ ManagedBean managed = registry.findManagedBean(mname);
+ String domain = managed.getDomain();
+ if (domain == null)
+ domain = mserver.getDefaultDomain();
+ ObjectName oname = createObjectName(domain, service);
+ mserver.unregisterMBean(oname);
}
1.5 +6 -12 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Index: ServerLifecycleListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerLifecycleListener.java 2001/10/27 18:56:23 1.4
+++ ServerLifecycleListener.java 2001/10/30 23:13:55 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v 1.4 2001/10/27 18:56:23 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2001/10/27 18:56:23 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java,v 1.5 2001/10/30 23:13:55 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/10/30 23:13:55 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
*
* @author Craig R. McClanahan
* @author Amy Roh
- * @version $Revision: 1.4 $ $Date: 2001/10/27 18:56:23 $
+ * @version $Revision: 1.5 $ $Date: 2001/10/30 23:13:55 $
*/
public class ServerLifecycleListener
@@ -472,17 +472,11 @@
}
if (debug >= 4)
log(" Removing MBean for Context " + context);
- MBeanServer mserver = MBeanUtils.createServer();
- mserver.unregisterMBean
- (MBeanUtils.createObjectName(mserver.getDefaultDomain(),
- context));
+ MBeanUtils.destroyMBean(context);
; // FIXME - child component MBeans?
} else if (child instanceof Host) {
Host host = (Host) child;
- MBeanServer mserver = MBeanUtils.createServer();
- mserver.unregisterMBean
- (MBeanUtils.createObjectName(mserver.getDefaultDomain(),
- host));
+ MBeanUtils.destroyMBean(host);
; // FIXME - child component MBeans?
}
} catch (MBeanException t) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>