Author: markt
Date: Tue Oct 28 04:52:12 2008
New Revision: 708541
URL: http://svn.apache.org/viewvc?rev=708541&view=rev
Log:
Remove references to DefaultContext from code
Removed:
tomcat/trunk/java/org/apache/catalina/mbeans/DefaultContextMBean.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue Oct 28
04:52:12 2008
@@ -457,7 +457,7 @@
/**
- * 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 @@
/**
- * 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 @@
/**
- * 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
*/
Modified: tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/core/mbeans-descriptors.xml Tue Oct
28 04:52:12 2008
@@ -158,7 +158,7 @@
type="java.lang.String"/>
<attribute name="override"
- description="The DefaultContext override flag for this web
application"
+ description="The default context.xml override flag for this web
application"
type="boolean"/>
<attribute name="parentClassLoader"
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ServerLifecycleListener.java
Tue Oct 28 04:52:12 2008
@@ -220,17 +220,7 @@
} 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 @@
/**
- * 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 @@
/**
- * 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 @@
/**
- * 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 <code>null</code>)
- * @param newValue The new value (may be <code>null</code>)
- *
- * @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
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Oct 28
04:52:12 2008
@@ -1040,7 +1040,7 @@
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 ) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Tue Oct
28 04:52:12 2008
@@ -25,8 +25,7 @@
/**
* <p><strong>RuleSet</strong> 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".</p>
+ * Context definition element.</p>
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Tue Oct 28
04:52:12 2008
@@ -26,9 +26,8 @@
/**
* <p><strong>RuleSet</strong> for processing the contents of a
* Engine definition element. This <code>RuleSet</code> does NOT include
- * any rules for nested Host or DefaultContext elements, which should
- * be added via instances of <code>HostRuleSet</code> or
- * <code>ContextRuleSet</code>, respectively.</p>
+ * any rules for nested Host elements, which should be added via instances of
+ * <code>HostRuleSet</code>.</p>
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Tue Oct 28
04:52:12 2008
@@ -26,8 +26,8 @@
/**
* <p><strong>RuleSet</strong> for processing the contents of a
* Host definition element. This <code>RuleSet</code> does NOT include
- * any rules for nested Context or DefaultContext elements, which should
- * be added via instances of <code>ContextRuleSet</code>.</p>
+ * any rules for nested Context which should be added via instances of
+ * <code>ContextRuleSet</code>.</p>
*
* @author Craig R. McClanahan
* @version $Revision$ $Date$
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Tue Oct 28
04:52:12 2008
@@ -36,8 +36,8 @@
/**
* Object factory for any Resource conforming to the JavaBean spec.
*
- * <p>This factory can be configured in a <code><DefaultContext></code>
- * or <code><Context></code> element in your <code>conf/server.xml</code>
+ * <p>This factory can be configured in a <code><Context></code> element
+ * in your <code>conf/server.xml</code>
* configuration file. An example of factory configuration is:</p>
* <pre>
* <Resource name="jdbc/myDataSource" auth="SERVLET"
Modified: tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java Tue Oct
28 04:52:12 2008
@@ -43,8 +43,8 @@
* connections. Defaults to <code>localhost</code> if not specified.</li>
* </ul>
*
- * <p>This factory can be configured in a <code><DefaultContext></code>
- * or <code><Context></code> element in your <code>conf/server.xml</code>
+ * <p>This factory can be configured in a
+ * <code><Context></code> element in your <code>conf/server.xml</code>
* configuration file. An example of factory configuration is:</p>
* <pre>
* <Resource name="mail/smtp" auth="CONTAINER"
Modified: tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java?rev=708541&r1=708540&r2=708541&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/SendMailFactory.java Tue Oct 28
04:52:12 2008
@@ -37,7 +37,7 @@
* Factory class that creates a JNDI named javamail MimePartDataSource
* object which can be used for sending email using SMTP.
* <p>
- * Can be configured in the DefaultContext or Context scope
+ * Can be configured in the Context scope
* of your server.xml configuration file.
* <p>
* Example:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
