Return-Path: 
 <tomcat-dev-return-29925-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 41494 invoked by uid 500); 16 Oct 2001 23:23:08 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:tomcat-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:tomcat-dev@jakarta.apache.org>
Reply-To: tomcat-dev@jakarta.apache.org
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 41485 invoked by uid 500); 16 Oct 2001 23:23:08 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Date: 16 Oct 2001 23:17:13 -0000
Message-ID: <20011016231713.1970.qmail@icarus.apache.org>
From: remm@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup
 Catalina.java ContextConfig.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

remm        01/10/16 16:17:13

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardEngine.java StandardHost.java
               catalina/src/share/org/apache/catalina/startup Catalina.java
                        ContextConfig.java
  Log:
  - The class which should be instantiated is StandardDefaultContext (in the Catalina mapper).
  - In all other cases, import the new DefaultContext interface.
  - I don't think I forgot anything, please check.
  
  Revision  Changes    Path
  1.11      +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java
  
  Index: StandardEngine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- StandardEngine.java	2001/08/23 22:32:10	1.10
  +++ StandardEngine.java	2001/10/16 23:17:13	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v 1.10 2001/08/23 22:32:10 craigmcc Exp $
  - * $Revision: 1.10 $
  - * $Date: 2001/08/23 22:32:10 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardEngine.java,v 1.11 2001/10/16 23:17:13 remm Exp $
  + * $Revision: 1.11 $
  + * $Date: 2001/10/16 23:17:13 $
    *
    * ====================================================================
    *
  @@ -71,6 +71,7 @@
   import javax.servlet.http.HttpServletResponse;
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  +import org.apache.catalina.DefaultContext;
   import org.apache.catalina.Engine;
   import org.apache.catalina.Globals;
   import org.apache.catalina.Host;
  @@ -78,7 +79,6 @@
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.Service;
  -import org.apache.catalina.core.DefaultContext;
   
   /**
    * Standard implementation of the <b>Engine</b> interface.  Each
  @@ -86,7 +86,7 @@
    * fully qualified host name of that virtual host.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.10 $ $Date: 2001/08/23 22:32:10 $
  + * @version $Revision: 1.11 $ $Date: 2001/10/16 23:17:13 $
    */
   
   public class StandardEngine
  
  
  
  1.20      +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java
  
  Index: StandardHost.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- StandardHost.java	2001/09/26 18:00:09	1.19
  +++ StandardHost.java	2001/10/16 23:17:13	1.20
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v 1.19 2001/09/26 18:00:09 remm Exp $
  - * $Revision: 1.19 $
  - * $Date: 2001/09/26 18:00:09 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardHost.java,v 1.20 2001/10/16 23:17:13 remm Exp $
  + * $Revision: 1.20 $
  + * $Date: 2001/10/16 23:17:13 $
    *
    * ====================================================================
    *
  @@ -82,6 +82,7 @@
   import javax.servlet.http.HttpServletResponse;
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  +import org.apache.catalina.DefaultContext;
   import org.apache.catalina.Deployer;
   import org.apache.catalina.Globals;
   import org.apache.catalina.HttpRequest;
  @@ -92,7 +93,6 @@
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.Valve;
  -import org.apache.catalina.core.DefaultContext;
   import org.apache.catalina.valves.ErrorDispatcherValve;
   
   
  @@ -103,7 +103,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.19 $ $Date: 2001/09/26 18:00:09 $
  + * @version $Revision: 1.20 $ $Date: 2001/10/16 23:17:13 $
    */
   
   public class StandardHost
  
  
  
  1.33      +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Catalina.java	2001/09/11 23:34:43	1.32
  +++ Catalina.java	2001/10/16 23:17:13	1.33
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.32 2001/09/11 23:34:43 craigmcc Exp $
  - * $Revision: 1.32 $
  - * $Date: 2001/09/11 23:34:43 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.33 2001/10/16 23:17:13 remm Exp $
  + * $Revision: 1.33 $
  + * $Date: 2001/10/16 23:17:13 $
    *
    * ====================================================================
    *
  @@ -98,7 +98,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.32 $ $Date: 2001/09/11 23:34:43 $
  + * @version $Revision: 1.33 $ $Date: 2001/10/16 23:17:13 $
    */
   
   public class Catalina {
  @@ -512,7 +512,7 @@
           XmlMapper mapper) {
   
           mapper.addRule(prefix + "", mapper.objectCreate
  -                       ("org.apache.catalina.core.DefaultContext",
  +                       ("org.apache.catalina.core.StandardDefaultContext",
                           "className"));
           mapper.addRule(prefix + "", mapper.setProperties());
           mapper.addRule(prefix + "", mapper.addChild
  
  
  
  1.53      +5 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- ContextConfig.java	2001/09/04 18:15:30	1.52
  +++ ContextConfig.java	2001/10/16 23:17:13	1.53
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v 1.52 2001/09/04 18:15:30 craigmcc Exp $
  - * $Revision: 1.52 $
  - * $Date: 2001/09/04 18:15:30 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v 1.53 2001/10/16 23:17:13 remm Exp $
  + * $Revision: 1.53 $
  + * $Date: 2001/10/16 23:17:13 $
    *
    * ====================================================================
    *
  @@ -90,6 +90,7 @@
   import org.apache.catalina.Authenticator;
   import org.apache.catalina.Container;
   import org.apache.catalina.Context;
  +import org.apache.catalina.DefaultContext;
   import org.apache.catalina.Globals;
   import org.apache.catalina.Lifecycle;
   import org.apache.catalina.LifecycleEvent;
  @@ -102,7 +103,6 @@
   import org.apache.catalina.Engine;
   import org.apache.catalina.Host;
   import org.apache.catalina.core.ContainerBase;
  -import org.apache.catalina.core.DefaultContext;
   import org.apache.catalina.core.StandardContext;
   import org.apache.catalina.deploy.LoginConfig;
   import org.apache.catalina.deploy.SecurityConstraint;
  @@ -128,7 +128,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.52 $ $Date: 2001/09/04 18:15:30 $
  + * @version $Revision: 1.53 $ $Date: 2001/10/16 23:17:13 $
    */
   
   public final class ContextConfig