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/07/17 18:32:44 UTC

cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java

craigmcc    01/07/17 09:32:42

  Modified:    catalina/docs/config context.html
               catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  Correct the default classname for the Loader implementation, which is used
  when you specify a <Loader> element without a "className" attribute.  Also
  correct the doc reference to the default Loader implementation, which is
  no longer StandardLoader.
  
  Submitted by: Kevin Jones <ke...@develop.com>
  
  Revision  Changes    Path
  1.5       +1 -1      jakarta-tomcat-4.0/catalina/docs/config/context.html
  
  Index: context.html
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/docs/config/context.html,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- context.html	2001/03/21 01:59:18	1.4
  +++ context.html	2001/07/17 16:32:31	1.5
  @@ -266,7 +266,7 @@
   <ul>
   <li>If you have not declared your own <a href="loader.html">Loader</a>
       to be installed, an instance of the standard Loader implementation class
  -    (<code>org.apache.catalina.loader.StandardLoader</code>) will be
  +    (<code>org.apache.catalina.loader.WebappLoader</code>) will be
       installed and configured.</li>
   <li>If you have not declared your own <a href="manager.html">Manager</a>
       to be installed, an instance of the standard Manager implementation class
  
  
  
  1.27      +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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Catalina.java	2001/06/22 02:02:59	1.26
  +++ Catalina.java	2001/07/17 16:32:38	1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.26 2001/06/22 02:02:59 remm Exp $
  - * $Revision: 1.26 $
  - * $Date: 2001/06/22 02:02:59 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.27 2001/07/17 16:32:38 craigmcc Exp $
  + * $Revision: 1.27 $
  + * $Date: 2001/07/17 16:32:38 $
    *
    * ====================================================================
    *
  @@ -98,7 +98,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.26 $ $Date: 2001/06/22 02:02:59 $
  + * @version $Revision: 1.27 $ $Date: 2001/07/17 16:32:38 $
    */
   
   public class Catalina {
  @@ -538,7 +538,7 @@
   			"org.apache.catalina.LifecycleListener"));
   
           mapper.addRule(prefix + "/Loader", new CreateLoaderAction
  -            ("org.apache.catalina.WebappLoader", "className"));
  +            ("org.apache.catalina.loader.WebappLoader", "className"));
   	mapper.addRule(prefix + "/Loader",
   		       mapper.setProperties());
   	mapper.addRule(prefix + "/Loader", mapper.addChild