Author: markt
Date: Sun Jan 8 09:49:20 2006
New Revision: 367054
URL: http://svn.apache.org/viewcvs?rev=367054&view=rev
Log:
Code clean up in o.a.c.mbeans
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/RoleMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardEngineMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardHostMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ConnectorMBean.java
Sun Jan 8 09:49:20 2006
@@ -19,9 +19,6 @@
import java.lang.reflect.Method;
import javax.management.MBeanException;
import javax.management.RuntimeOperationsException;
-import org.apache.catalina.Connector;
-import org.apache.catalina.Service;
-import org.apache.commons.modeler.BaseModelMBean;
/**
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
Sun Jan 8 09:49:20 2006
@@ -17,13 +17,10 @@
package org.apache.catalina.mbeans;
-import java.util.ArrayList;
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
-import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
Sun Jan 8 09:49:20 2006
@@ -17,19 +17,15 @@
package org.apache.catalina.mbeans;
-import java.util.ArrayList;
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
-import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.ResourceParams;
import org.apache.commons.modeler.BaseModelMBean;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ContextResourceMBean.java
Sun Jan 8 09:49:20 2006
@@ -17,13 +17,10 @@
package org.apache.catalina.mbeans;
-import java.util.ArrayList;
import javax.management.Attribute;
import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
-import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
-import javax.management.ObjectName;
import javax.management.ReflectionException;
import javax.management.RuntimeOperationsException;
import javax.management.modelmbean.InvalidTargetObjectTypeException;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/DefaultContextMBean.java
Sun Jan 8 09:49:20 2006
@@ -27,7 +27,6 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.ResourceParams;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
Sun Jan 8 09:49:20 2006
@@ -18,11 +18,7 @@
import java.util.Iterator;
-import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import javax.naming.Binding;
-import javax.naming.CompositeName;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.OperationNotSupportedException;
@@ -33,11 +29,8 @@
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Role;
-import org.apache.catalina.Server;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
-import org.apache.catalina.core.StandardServer;
-import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/GroupMBean.java
Sun Jan 8 09:49:20 2006
@@ -27,7 +27,6 @@
import org.apache.catalina.Group;
import org.apache.catalina.Role;
import org.apache.catalina.User;
-import org.apache.catalina.UserDatabase;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
Sun Jan 8 09:49:20 2006
@@ -19,9 +19,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import javax.management.MBeanException;
-import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.management.ObjectInstance;
import javax.management.RuntimeOperationsException;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
@@ -29,9 +27,7 @@
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
import org.apache.catalina.Host;
-import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
-import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
@@ -39,13 +35,10 @@
import org.apache.catalina.Valve;
import org.apache.catalina.authenticator.SingleSignOn;
import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.core.StandardServer;
import org.apache.catalina.core.StandardService;
import org.apache.catalina.core.StandardDefaultContext;
import org.apache.catalina.core.StandardEngine;
import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.core.StandardServer;
-import org.apache.catalina.core.StandardService;
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.logger.FileLogger;
import org.apache.catalina.logger.SystemErrLogger;
@@ -77,11 +70,6 @@
public class MBeanFactory extends BaseModelMBean {
/**
- * The <code>MBeanServer</code> for this application.
- */
- private static MBeanServer mserver = MBeanUtils.createServer();
-
- /**
* The configuration information registry for our managed beans.
*/
private static Registry registry = MBeanUtils.createRegistry();
@@ -268,7 +256,6 @@
// Add the new instance to its parent component
ObjectName pname = new ObjectName(parent);
- String type = pname.getKeyProperty("type");
Server server = ServerFactory.getServer();
String serviceName = pname.getKeyProperty("service");
if (serviceName == null) {
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/MBeanUtils.java
Sun Jan 8 09:49:20 2006
@@ -20,15 +20,10 @@
import java.io.InputStream;
import java.net.URL;
import java.net.URLEncoder;
-import javax.management.InstanceAlreadyExistsException;
import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import javax.management.OperationsException;
-import javax.management.modelmbean.InvalidTargetObjectTypeException;
import javax.management.modelmbean.ModelMBean;
import org.apache.catalina.Connector;
@@ -38,15 +33,12 @@
import org.apache.catalina.Engine;
import org.apache.catalina.Group;
import org.apache.catalina.Host;
-import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.LifecycleListener;
import org.apache.catalina.Loader;
import org.apache.catalina.Logger;
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
import org.apache.catalina.Role;
import org.apache.catalina.Server;
-import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
import org.apache.catalina.User;
import org.apache.catalina.UserDatabase;
@@ -54,12 +46,10 @@
import org.apache.catalina.Wrapper;
import org.apache.catalina.Contained;
import org.apache.catalina.connector.http.HttpConnector;
-import org.apache.catalina.core.StandardService;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.ResourceParams;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
@@ -891,7 +881,6 @@
ObjectName name = null;
Host host = (Host)context.getParent();
- Service service = ((Engine)host.getParent()).getService();
String path = context.getPath();
if (path.length() < 1)
path = "/";
@@ -918,7 +907,6 @@
ObjectName name = null;
Context context=(Context)wrapper.getParent();
Host host = (Host)context.getParent();
- Service service = ((Engine)host.getParent()).getService();
String sname=wrapper.getJspFile();
if( sname==null ) {
sname=wrapper.getName();
@@ -1648,13 +1636,12 @@
if (registry == null) {
try {
+ registry = Registry.getRegistry(null, null);
URL url = ServerLifecycleListener.class.getResource
("/org/apache/catalina/mbeans/mbeans-descriptors.xml");
InputStream stream = url.openStream();
- // Registry.setDebug(1);
- Registry.loadRegistry(stream);
+ registry.loadMetadata(stream);
stream.close();
- registry = Registry.getRegistry();
} catch (Throwable t) {
t.printStackTrace(System.out);
System.exit(1);
@@ -1674,7 +1661,7 @@
URL url = ServerLifecycleListener.class.getResource(resource);
if (url != null) {
InputStream stream = url.openStream();
- Registry.loadRegistry(stream);
+ Registry.getRegistry(null, null).loadMetadata(stream);
stream.close();
} else {
// XXX: i18n
@@ -1698,7 +1685,7 @@
try {
//Trace.parseTraceProperties();
//mserver = MBeanServerFactory.createMBeanServer();
- mserver = Registry.getServer();
+ mserver = Registry.getRegistry(null, null).getMBeanServer();
} catch (Throwable t) {
t.printStackTrace(System.out);
System.exit(1);
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/NamingResourcesMBean.java
Sun Jan 8 09:49:20 2006
@@ -26,7 +26,6 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.ResourceParams;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/RoleMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/RoleMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/RoleMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/RoleMBean.java
Sun Jan 8 09:49:20 2006
@@ -17,17 +17,9 @@
package org.apache.catalina.mbeans;
-import java.util.ArrayList;
-import java.util.Iterator;
-import javax.management.MalformedObjectNameException;
import javax.management.MBeanException;
import javax.management.MBeanServer;
-import javax.management.ObjectName;
import javax.management.RuntimeOperationsException;
-import org.apache.catalina.Group;
-import org.apache.catalina.Role;
-import org.apache.catalina.User;
-import org.apache.catalina.UserDatabase;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/ServerLifecycleListener.java
Sun Jan 8 09:49:20 2006
@@ -19,22 +19,14 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
import java.util.StringTokenizer;
import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import org.apache.catalina.Connector;
import org.apache.catalina.Container;
import org.apache.catalina.Context;
import org.apache.catalina.DefaultContext;
import org.apache.catalina.Engine;
-import org.apache.catalina.Group;
import org.apache.catalina.Host;
import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
@@ -42,15 +34,11 @@
import org.apache.catalina.Logger;
import org.apache.catalina.Manager;
import org.apache.catalina.Realm;
-import org.apache.catalina.Role;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
import org.apache.catalina.Service;
-import org.apache.catalina.User;
-import org.apache.catalina.UserDatabase;
import org.apache.catalina.Valve;
import org.apache.catalina.Wrapper;
-import org.apache.catalina.Contained;
import org.apache.catalina.ContainerListener;
import org.apache.catalina.ContainerEvent;
import org.apache.catalina.Lifecycle;
@@ -61,12 +49,10 @@
import org.apache.catalina.core.StandardServer;
import org.apache.catalina.core.StandardService;
import org.apache.catalina.core.StandardWrapper;
-import org.apache.catalina.core.ContainerBase;
import org.apache.catalina.deploy.ContextEnvironment;
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.ResourceParams;
/**
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardContextMBean.java
Sun Jan 8 09:49:20 2006
@@ -27,7 +27,6 @@
import org.apache.catalina.deploy.ContextResource;
import org.apache.catalina.deploy.ContextResourceLink;
import org.apache.catalina.deploy.NamingResources;
-import org.apache.catalina.deploy.ResourceParams;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardEngineMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardEngineMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardEngineMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardEngineMBean.java
Sun Jan 8 09:49:20 2006
@@ -18,18 +18,7 @@
import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import javax.management.RuntimeOperationsException;
-import org.apache.catalina.Container;
-import org.apache.catalina.Engine;
-import org.apache.catalina.Host;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Service;
-import org.apache.catalina.Realm;
-import org.apache.catalina.Valve;
-import org.apache.catalina.core.StandardHost;
-import org.apache.catalina.core.StandardEngine;
import org.apache.commons.modeler.BaseModelMBean;
@@ -43,11 +32,6 @@
public class StandardEngineMBean extends BaseModelMBean {
- /**
- * The <code>MBeanServer</code> for this application.
- */
- private static MBeanServer mserver = MBeanUtils.createServer();
-
// ----------------------------------------------------------- Constructors
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardHostMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardHostMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardHostMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardHostMBean.java
Sun Jan 8 09:49:20 2006
@@ -19,14 +19,8 @@
import javax.management.MBeanException;
import javax.management.MBeanServer;
-import javax.management.ObjectName;
import javax.management.RuntimeOperationsException;
-import org.apache.catalina.Engine;
-import org.apache.catalina.Host;
-import org.apache.catalina.Logger;
-import org.apache.catalina.Realm;
import org.apache.catalina.Valve;
-import org.apache.catalina.core.StandardContext;
import org.apache.catalina.core.StandardHost;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.Registry;
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServerMBean.java
Sun Jan 8 09:49:20 2006
@@ -19,7 +19,6 @@
import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
-import javax.management.MBeanServer;
import javax.management.RuntimeOperationsException;
import org.apache.catalina.Server;
import org.apache.catalina.ServerFactory;
@@ -36,15 +35,6 @@
*/
public class StandardServerMBean extends BaseModelMBean {
-
-
- // ------------------------------------------------------- Static Variables
-
-
- /**
- * The <code>MBeanServer</code> for this application.
- */
- private static MBeanServer mserver = MBeanUtils.createServer();
// ----------------------------------------------------------- Constructors
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/StandardServiceMBean.java
Sun Jan 8 09:49:20 2006
@@ -18,11 +18,7 @@
import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import javax.management.RuntimeOperationsException;
-import org.apache.catalina.Connector;
-import org.apache.catalina.Service;
import org.apache.commons.modeler.BaseModelMBean;
@@ -35,11 +31,6 @@
*/
public class StandardServiceMBean extends BaseModelMBean {
-
- /**
- * The <code>MBeanServer</code> for this application.
- */
- private static MBeanServer mserver = MBeanUtils.createServer();
// ----------------------------------------------------------- Constructors
Modified:
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java
URL:
http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java?rev=367054&r1=367053&r2=367054&view=diff
==============================================================================
---
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java
(original)
+++
tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/mbeans/UserMBean.java
Sun Jan 8 09:49:20 2006
@@ -27,7 +27,6 @@
import org.apache.catalina.Group;
import org.apache.catalina.Role;
import org.apache.catalina.User;
-import org.apache.catalina.UserDatabase;
import org.apache.commons.modeler.BaseModelMBean;
import org.apache.commons.modeler.ManagedBean;
import org.apache.commons.modeler.Registry;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
