tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java
Date Wed, 03 Jan 2001 20:07:32 GMT
craigmcc    01/01/03 12:07:32

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  Correct the default class name for <Loader> elements in the server.xml file.
  
  Submitted by:  Jon Stevens <jon@latchkey.com>
  
  NOTE:  I also removed the configuration of a <Loader> or <Manager> element
  nested under an <Engine> or a <Host> -- loaders and session managers can only
  be nested inside a <Context>.
  
  Revision  Changes    Path
  1.10      +5 -37     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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Catalina.java	2000/12/07 07:25:50	1.9
  +++ Catalina.java	2001/01/03 20:07:30	1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.9 2000/12/07 07:25:50 remm Exp $
  - * $Revision: 1.9 $
  - * $Date: 2000/12/07 07:25:50 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.10 2001/01/03 20:07:30 craigmcc Exp $
  + * $Revision: 1.10 $
  + * $Date: 2001/01/03 20:07:30 $
    *
    * ====================================================================
    *
  @@ -95,7 +95,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.9 $ $Date: 2000/12/07 07:25:50 $
  + * @version $Revision: 1.10 $ $Date: 2001/01/03 20:07:30 $
    */
   
   public class Catalina {
  @@ -348,14 +348,6 @@
   		       ("addLifecycleListener",
   			"org.apache.catalina.LifecycleListener"));
   
  -	mapper.addRule("Server/Service/Engine/Host/Loader", mapper.objectCreate
  -		       ("org.apache.catalina.core.StandardLoader",
  -			"className"));
  -	mapper.addRule("Server/Service/Engine/Host/Loader",
  -                       mapper.setProperties());
  -	mapper.addRule("Engine/Service/Engine/Host/Loader", mapper.addChild
  -		       ("setLoader", "org.apache.catalina.Loader"));
  -
   	mapper.addRule("Server/Service/Engine/Host/Logger", mapper.objectCreate
   		       (null, "className"));
   	mapper.addRule("Server/Service/Engine/Host/Logger",
  @@ -363,15 +355,6 @@
   	mapper.addRule("Server/Service/Engine/Host/Logger", mapper.addChild
   		       ("setLogger", "org.apache.catalina.Logger"));
   
  -	mapper.addRule("Server/Service/Engine/Host/Manager",
  -                       mapper.objectCreate
  -		       ("org.apache.catalina.session.StandardManager",
  -			"className"));
  -	mapper.addRule("Server/Service/Engine/Host/Manager",
  -                       mapper.setProperties());
  -	mapper.addRule("Server/Service/Engine/Host/Manager", mapper.addChild
  -		       ("setManager", "org.apache.catalina.Manager"));
  -
   	mapper.addRule("Server/Service/Engine/Host/Realm", mapper.objectCreate
   		       (null, "className"));
   	mapper.addRule("Server/Service/Engine/Host/Realm",
  @@ -403,27 +386,12 @@
   		       ("addLifecycleListener",
   			"org.apache.catalina.LifecycleListener"));
   
  -	mapper.addRule("Server/Service/Engine/Loader", mapper.objectCreate
  -		       ("org.apache.catalina.core.StandardLoader",
  -			"className"));
  -	mapper.addRule("Server/Service/Engine/Loader", mapper.setProperties());
  -	mapper.addRule("Server/Service/Engine/Loader", mapper.addChild
  -		       ("setLoader", "org.apache.catalina.Loader"));
  -
   	mapper.addRule("Server/Service/Engine/Logger", mapper.objectCreate
   		       (null, "className"));
   	mapper.addRule("Server/Service/Engine/Logger", mapper.setProperties());
   	mapper.addRule("Server/Service/Engine/Logger", mapper.addChild
   		       ("setLogger", "org.apache.catalina.Logger"));
   
  -	mapper.addRule("Server/Service/Engine/Manager", mapper.objectCreate
  -		       ("org.apache.catalina.session.StandardManager",
  -			"className"));
  -	mapper.addRule("Server/Service/Engine/Manager",
  -                       mapper.setProperties());
  -	mapper.addRule("Server/Service/Engine/Manager", mapper.addChild
  -		       ("setManager", "org.apache.catalina.Manager"));
  -
   	mapper.addRule("Server/Service/Engine/Realm", mapper.objectCreate
   		       (null, "className"));
   	mapper.addRule("Server/Service/Engine/Realm", mapper.setProperties());
  @@ -513,7 +481,7 @@
   
   	mapper.addRule(prefix + "/Loader",
   		       mapper.objectCreate
  -		       ("org.apache.catalina.core.StandardLoader",
  +		       ("org.apache.catalina.loader.StandardLoader",
   			"className"));
   	mapper.addRule(prefix + "/Loader",
   		       mapper.setProperties());
  
  
  

Mime
View raw message