From 86943ef2b3aa82857e2300760a5915157bc8da82 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 28 Oct 2008 11:52:12 +0000 Subject: [PATCH] Remove references to DefaultContext from code git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@708541 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/StandardContext.java | 6 +- .../apache/catalina/core/mbeans-descriptors.xml | 2 +- .../catalina/mbeans/DefaultContextMBean.java | 329 --------------------- .../catalina/mbeans/ServerLifecycleListener.java | 180 +---------- .../org/apache/catalina/startup/ContextConfig.java | 2 +- .../apache/catalina/startup/ContextRuleSet.java | 3 +- .../org/apache/catalina/startup/EngineRuleSet.java | 5 +- java/org/apache/catalina/startup/HostRuleSet.java | 4 +- java/org/apache/naming/factory/BeanFactory.java | 4 +- .../apache/naming/factory/MailSessionFactory.java | 4 +- .../org/apache/naming/factory/SendMailFactory.java | 2 +- 11 files changed, 16 insertions(+), 525 deletions(-) delete mode 100644 java/org/apache/catalina/mbeans/DefaultContextMBean.java diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index b640d5514..1b1651cb4 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -457,7 +457,7 @@ public class StandardContext /** - * The DefaultContext override flag for this web application. + * The default context override flag for this web application. */ private boolean override = false; @@ -1537,7 +1537,7 @@ public class StandardContext /** - * Return the DefaultContext override flag for this web application. + * Return the default context override flag for this web application. */ public boolean getOverride() { @@ -1629,7 +1629,7 @@ public class StandardContext /** - * Set the DefaultContext override flag for this web application. + * Set the default context override flag for this web application. * * @param override The new override flag */ diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml index 34ddce36a..f06ad74e9 100644 --- a/java/org/apache/catalina/core/mbeans-descriptors.xml +++ b/java/org/apache/catalina/core/mbeans-descriptors.xml @@ -158,7 +158,7 @@ type="java.lang.String"/> A ModelMBean implementation for the - * org.apache.catalina.core.StandardDefaultContext component.

- * - * @author Amy Roh - * @version $Revision$ $Date$ - */ - -public class DefaultContextMBean extends BaseModelMBean { - - - // ----------------------------------------------------------- Constructors - - - /** - * Construct a ModelMBean with default - * ModelMBeanInfo information. - * - * @exception MBeanException if the initializer of an object - * throws an exception - * @exception RuntimeOperationsException if an IllegalArgumentException - * occurs - */ - public DefaultContextMBean() - throws MBeanException, RuntimeOperationsException { - - super(); - - } - - - // ----------------------------------------------------- Instance Variables - - - /** - * The configuration information registry for our managed beans. - */ - protected Registry registry = MBeanUtils.createRegistry(); - - /** - * The ManagedBean information describing this MBean. - */ - protected ManagedBean managed = - registry.findManagedBean("DefaultContext"); - - - // ------------------------------------------------------------- Attributes - - - /** - * Return the naming resources associated with this web application. - */ - private NamingResources getNamingResources() { - - return ((Context)this.resource).getNamingResources(); - - } - - - /** - * Return the MBean Names of the set of defined environment entries for - * this web application - */ - public String[] getEnvironments() { - ContextEnvironment[] envs = getNamingResources().findEnvironments(); - ArrayList results = new ArrayList(); - for (int i = 0; i < envs.length; i++) { - try { - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), envs[i]); - results.add(oname.toString()); - } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for environment " + envs[i]); - iae.initCause(e); - throw iae; - } - } - return ((String[]) results.toArray(new String[results.size()])); - - } - - - /** - * Return the MBean Names of all the defined resource references for this - * application. - */ - public String[] getResources() { - - ContextResource[] resources = getNamingResources().findResources(); - ArrayList results = new ArrayList(); - for (int i = 0; i < resources.length; i++) { - try { - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), resources[i]); - results.add(oname.toString()); - } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for resource " + resources[i]); - iae.initCause(e); - throw iae; - } - } - return ((String[]) results.toArray(new String[results.size()])); - - } - - - /** - * Return the MBean Names of all the defined resource links for this - * application - */ - public String[] getResourceLinks() { - - ContextResourceLink[] links = getNamingResources().findResourceLinks(); - ArrayList results = new ArrayList(); - for (int i = 0; i < links.length; i++) { - try { - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), links[i]); - results.add(oname.toString()); - } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for resource " + links[i]); - iae.initCause(e); - throw iae; - } - } - return ((String[]) results.toArray(new String[results.size()])); - - } - - // ------------------------------------------------------------- Operations - - - /** - * Add an environment entry for this web application. - * - * @param envName New environment entry name - */ - public String addEnvironment(String envName, String type) - throws MalformedObjectNameException { - - NamingResources nresources = getNamingResources(); - if (nresources == null) { - return null; - } - ContextEnvironment env = nresources.findEnvironment(envName); - if (env != null) { - throw new IllegalArgumentException - ("Invalid environment name - already exists '" + envName + "'"); - } - env = new ContextEnvironment(); - env.setName(envName); - env.setType(type); - nresources.addEnvironment(env); - - // Return the corresponding MBean name - ManagedBean managed = registry.findManagedBean("ContextEnvironment"); - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), env); - return (oname.toString()); - - } - - - /** - * Add a resource reference for this web application. - * - * @param resourceName New resource reference name - */ - public String addResource(String resourceName, String type) - throws MalformedObjectNameException { - - NamingResources nresources = getNamingResources(); - if (nresources == null) { - return null; - } - ContextResource resource = nresources.findResource(resourceName); - if (resource != null) { - throw new IllegalArgumentException - ("Invalid resource name - already exists'" + resourceName + "'"); - } - resource = new ContextResource(); - resource.setName(resourceName); - resource.setType(type); - nresources.addResource(resource); - - // Return the corresponding MBean name - ManagedBean managed = registry.findManagedBean("ContextResource"); - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), resource); - - return (oname.toString()); - } - - - /** - * Add a resource link for this web application. - * - * @param resourceLinkName New resource link name - */ - public String addResourceLink(String resourceLinkName, String global, - String name, String type) throws MalformedObjectNameException { - - NamingResources nresources = getNamingResources(); - if (nresources == null) { - return null; - } - ContextResourceLink resourceLink = - nresources.findResourceLink(resourceLinkName); - if (resourceLink != null) { - throw new IllegalArgumentException - ("Invalid resource link name - already exists'" + - resourceLinkName + "'"); - } - resourceLink = new ContextResourceLink(); - resourceLink.setGlobal(global); - resourceLink.setName(resourceLinkName); - resourceLink.setType(type); - nresources.addResourceLink(resourceLink); - - // Return the corresponding MBean name - ManagedBean managed = registry.findManagedBean("ContextResourceLink"); - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), resourceLink); - return (oname.toString()); - } - - - /** - * Remove any environment entry with the specified name. - * - * @param envName Name of the environment entry to remove - */ - public void removeEnvironment(String envName) { - - NamingResources nresources = getNamingResources(); - if (nresources == null) { - return; - } - ContextEnvironment env = nresources.findEnvironment(envName); - if (env == null) { - throw new IllegalArgumentException - ("Invalid environment name '" + envName + "'"); - } - nresources.removeEnvironment(envName); - - } - - - /** - * Remove any resource reference with the specified name. - * - * @param resourceName Name of the resource reference to remove - */ - public void removeResource(String resourceName) { - - resourceName = ObjectName.unquote(resourceName); - NamingResources nresources = getNamingResources(); - if (nresources == null) { - return; - } - ContextResource resource = nresources.findResource(resourceName); - if (resource == null) { - throw new IllegalArgumentException - ("Invalid resource name '" + resourceName + "'"); - } - nresources.removeResource(resourceName); - } - - - /** - * Remove any resource link with the specified name. - * - * @param resourceLinkName Name of the resource reference to remove - */ - public void removeResourceLink(String resourceLinkName) { - - resourceLinkName = ObjectName.unquote(resourceLinkName); - NamingResources nresources = getNamingResources(); - if (nresources == null) { - return; - } - ContextResourceLink resource = nresources.findResourceLink(resourceLinkName); - if (resource == null) { - throw new IllegalArgumentException - ("Invalid resource name '" + resourceLinkName + "'"); - } - nresources.removeResourceLink(resourceLinkName); - } - - -} diff --git a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java index 1a2d7614a..7c79d69be 100644 --- a/java/org/apache/catalina/mbeans/ServerLifecycleListener.java +++ b/java/org/apache/catalina/mbeans/ServerLifecycleListener.java @@ -220,17 +220,7 @@ public class ServerLifecycleListener } catch (Exception e) { log.error("Exception handling Container property change", e); } - }/* else if (event.getSource() instanceof DefaultContext) { - try { - processDefaultContextPropertyChange - ((DefaultContext) event.getSource(), - event.getPropertyName(), - event.getOldValue(), - event.getNewValue()); - } catch (Exception e) { - log.error("Exception handling DefaultContext property change", e); - } - }*/ else if (event.getSource() instanceof NamingResources) { + } else if (event.getSource() instanceof NamingResources) { try { processNamingResourcesPropertyChange ((NamingResources) event.getSource(), @@ -426,46 +416,6 @@ public class ServerLifecycleListener /** - * Create the MBeans for the specified DefaultContext and its nested components. - * - * @param dcontext DefaultContext for which to create MBeans - * - * @exception Exception if an exception is thrown during MBean creation - */ - /* - protected void createMBeans(DefaultContext dcontext) throws Exception { - - // Create the MBean for the DefaultContext itself - if (log.isDebugEnabled()) - log.debug("Creating MBean for DefaultContext " + dcontext); - MBeanUtils.createMBean(dcontext); - - dcontext.addPropertyChangeListener(this); - - // Create the MBeans for the associated nested components - Loader dLoader = dcontext.getLoader(); - if (dLoader != null) { - if (log.isDebugEnabled()) - log.debug("Creating MBean for Loader " + dLoader); - //MBeanUtils.createMBean(dLoader); - } - - Manager dManager = dcontext.getManager(); - if (dManager != null) { - if (log.isDebugEnabled()) - log.debug("Creating MBean for Manager " + dManager); - //MBeanUtils.createMBean(dManager); - } - - // Create the MBeans for the NamingResources (if any) - NamingResources resources = dcontext.getNamingResources(); - createMBeans(resources); - - } - */ - - - /** * Create the MBeans for the specified Engine and its nested components. * * @param engine Engine for which to create MBeans @@ -794,47 +744,6 @@ public class ServerLifecycleListener /** - * Deregister the MBeans for the specified DefaultContext and its nested - * components. - * - * @param dcontext DefaultContext for which to deregister MBeans - * - * @exception Exception if an exception is thrown during MBean destruction - */ - /* - protected void destroyMBeans(DefaultContext dcontext) throws Exception { - - Manager dManager = dcontext.getManager(); - if (dManager != null) { - if (log.isDebugEnabled()) - log.debug("Destroying MBean for Manager " + dManager); - //MBeanUtils.destroyMBean(dManager); - } - - Loader dLoader = dcontext.getLoader(); - if (dLoader != null) { - if (log.isDebugEnabled()) - log.debug("Destroying MBean for Loader " + dLoader); - //MBeanUtils.destroyMBean(dLoader); - } - - // Destroy the MBeans for the NamingResources (if any) - NamingResources resources = dcontext.getNamingResources(); - if (resources != null) { - destroyMBeans(resources); - } - - // deregister the MBean for the DefaultContext itself - if (log.isDebugEnabled()) - log.debug("Destroying MBean for Context " + dcontext); - MBeanUtils.destroyMBean(dcontext); - dcontext.removePropertyChangeListener(this); - - } - */ - - - /** * Deregister the MBeans for the specified Engine and its nested * components. * @@ -1142,93 +1051,6 @@ public class ServerLifecycleListener /** - * Process a property change event on a DefaultContext. - * - * @param defaultContext The DefaultContext on which this event occurred - * @param propertyName The name of the property that changed - * @param oldValue The previous value (may be null) - * @param newValue The new value (may be null) - * - * @exception Exception if an exception is thrown - */ - /* - protected void processDefaultContextPropertyChange(DefaultContext defaultContext, - String propertyName, - Object oldValue, - Object newValue) - throws Exception { - - if (log.isTraceEnabled()) { - log.trace("propertyChange[defaultContext=" + defaultContext + - ",propertyName=" + propertyName + - ",oldValue=" + oldValue + - ",newValue=" + newValue + "]"); - } - if ("loader".equals(propertyName)) { - if (oldValue != null) { - if (log.isDebugEnabled()) { - log.debug("Removing MBean for Loader " + oldValue); - } - MBeanUtils.destroyMBean((Loader) oldValue); - } - if (newValue != null) { - if (log.isDebugEnabled()) { - log.debug("Creating MBean for Loader " + newValue); - } - MBeanUtils.createMBean((Loader) newValue); - } - } else if ("logger".equals(propertyName)) { - if (oldValue != null) { - if (log.isDebugEnabled()) { - log.debug("Removing MBean for Logger " + oldValue); - } - //MBeanUtils.destroyMBean((Logger) oldValue); - } - if (newValue != null) { - if (log.isDebugEnabled()) { - log.debug("Creating MBean for Logger " + newValue); - } - //MBeanUtils.createMBean((Logger) newValue); - } - } else if ("manager".equals(propertyName)) { - if (oldValue != null) { - if (log.isDebugEnabled()) { - log.debug("Removing MBean for Manager " + oldValue); - } - MBeanUtils.destroyMBean((Manager) oldValue); - } - if (newValue != null) { - if (log.isDebugEnabled()) { - log.debug("Creating MBean for Manager " + newValue); - } - MBeanUtils.createMBean((Manager) newValue); - } - } else if ("realm".equals(propertyName)) { - if (oldValue != null) { -// if (log.isDebugEnabled()) { -// log.debug("Removing MBean for Realm " + oldValue); -// } -// //MBeanUtils.destroyMBean((Realm) oldValue); - } - if (newValue != null) { -// if (log.isDebugEnabled()) { -// log.debug("Creating MBean for Realm " + newValue); -// } -// //MBeanUtils.createMBean((Realm) newValue); - } - } else if ("service".equals(propertyName)) { - if (oldValue != null) { - destroyMBeans((Service) oldValue); - } - if (newValue != null) { - createMBeans((Service) newValue); - } - } - - }*/ - - - /** * Process the removal of a child Container from a parent Container. * * @param parent Parent container diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index 78c91afe0..11fd2db47 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -1040,7 +1040,7 @@ public class ContextConfig if (log.isDebugEnabled()) log.debug(sm.getString("contextConfig.start")); - // Set properties based on DefaultContext + // Set properties based on default context Container container = context.getParent(); if( !context.getOverride() ) { if( container instanceof Host ) { diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java b/java/org/apache/catalina/startup/ContextRuleSet.java index 88a6abbda..9f176e9c3 100644 --- a/java/org/apache/catalina/startup/ContextRuleSet.java +++ b/java/org/apache/catalina/startup/ContextRuleSet.java @@ -25,8 +25,7 @@ import org.apache.tomcat.util.digester.RuleSetBase; /** *

RuleSet for processing the contents of a - * Context or DefaultContext definition element. To enable parsing of a - * DefaultContext, be sure to specify a prefix that ends with "/Default".

+ * Context definition element.

* * @author Craig R. McClanahan * @version $Revision$ $Date$ diff --git a/java/org/apache/catalina/startup/EngineRuleSet.java b/java/org/apache/catalina/startup/EngineRuleSet.java index 315716bcb..c33cc1dad 100644 --- a/java/org/apache/catalina/startup/EngineRuleSet.java +++ b/java/org/apache/catalina/startup/EngineRuleSet.java @@ -26,9 +26,8 @@ import org.apache.tomcat.util.digester.RuleSetBase; /** *

RuleSet for processing the contents of a * Engine definition element. This RuleSet does NOT include - * any rules for nested Host or DefaultContext elements, which should - * be added via instances of HostRuleSet or - * ContextRuleSet, respectively.

+ * any rules for nested Host elements, which should be added via instances of + * HostRuleSet.

* * @author Craig R. McClanahan * @version $Revision$ $Date$ diff --git a/java/org/apache/catalina/startup/HostRuleSet.java b/java/org/apache/catalina/startup/HostRuleSet.java index 042f1c41c..542e8c46e 100644 --- a/java/org/apache/catalina/startup/HostRuleSet.java +++ b/java/org/apache/catalina/startup/HostRuleSet.java @@ -26,8 +26,8 @@ import org.apache.tomcat.util.digester.RuleSetBase; /** *

RuleSet for processing the contents of a * Host definition element. This RuleSet does NOT include - * any rules for nested Context or DefaultContext elements, which should - * be added via instances of ContextRuleSet.

+ * any rules for nested Context which should be added via instances of + * ContextRuleSet.

* * @author Craig R. McClanahan * @version $Revision$ $Date$ diff --git a/java/org/apache/naming/factory/BeanFactory.java b/java/org/apache/naming/factory/BeanFactory.java index 9bc0e4137..e85c195f8 100644 --- a/java/org/apache/naming/factory/BeanFactory.java +++ b/java/org/apache/naming/factory/BeanFactory.java @@ -36,8 +36,8 @@ import java.lang.reflect.Method; /** * Object factory for any Resource conforming to the JavaBean spec. * - *

This factory can be configured in a <DefaultContext> - * or <Context> element in your conf/server.xml + *

This factory can be configured in a <Context> element + * in your conf/server.xml * configuration file. An example of factory configuration is:

* 
  * <Resource name="jdbc/myDataSource" auth="SERVLET"
diff --git a/java/org/apache/naming/factory/MailSessionFactory.java b/java/org/apache/naming/factory/MailSessionFactory.java
index eefcf085b..1261eb9dc 100644
--- a/java/org/apache/naming/factory/MailSessionFactory.java
+++ b/java/org/apache/naming/factory/MailSessionFactory.java
@@ -43,8 +43,8 @@ import javax.naming.spi.ObjectFactory;
  *     connections.  Defaults to localhost if not specified.
  * 
  *
- * 
This factory can be configured in a <DefaultContext>
- * or <Context> element in your conf/server.xml
+ * 
This factory can be configured in a 
+ * <Context> element in your conf/server.xml
  * configuration file.  An example of factory configuration is:

  * 
  * <Resource name="mail/smtp" auth="CONTAINER"
diff --git a/java/org/apache/naming/factory/SendMailFactory.java b/java/org/apache/naming/factory/SendMailFactory.java
index 27d99096c..82ce32b5a 100644
--- a/java/org/apache/naming/factory/SendMailFactory.java
+++ b/java/org/apache/naming/factory/SendMailFactory.java
@@ -37,7 +37,7 @@ import javax.naming.spi.ObjectFactory;
  * Factory class that creates a JNDI named javamail MimePartDataSource
  * object which can be used for sending email using SMTP.
  * 

- * Can be configured in the DefaultContext or Context scope
+ * Can be configured in the Context scope
  * of your server.xml configuration file.
  * 

  * Example:
-- 
2.11.0