tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java
Date Sun, 11 Nov 2001 18:37:33 GMT
remm        01/11/11 10:37:33

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  - Fix bug 4797. I had forgotten to add back the naming rules for the default
    context.
  
  Revision  Changes    Path
  1.38      +6 -4      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.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Catalina.java	2001/11/08 21:03:27	1.37
  +++ Catalina.java	2001/11/11 18:37:33	1.38
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.37 2001/11/08 21:03:27 remm Exp $
  - * $Revision: 1.37 $
  - * $Date: 2001/11/08 21:03:27 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
1.38 2001/11/11 18:37:33 remm Exp $
  + * $Revision: 1.38 $
  + * $Date: 2001/11/11 18:37:33 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.37 $ $Date: 2001/11/08 21:03:27 $
  + * @version $Revision: 1.38 $ $Date: 2001/11/11 18:37:33 $
    */
   
   public class Catalina {
  @@ -350,7 +350,9 @@
           digester.addRuleSet(new EngineRuleSet("Server/Service/"));
           digester.addRuleSet(new HostRuleSet("Server/Service/Engine/"));
           digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Default"));
  +        digester.addRuleSet(new NamingRuleSet("Server/Service/Engine/DefaultContext/"));
           digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Host/Default"));
  +        digester.addRuleSet(new NamingRuleSet("Server/Service/Engine/Host/DefaultContext/"));
           digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Host/"));
           digester.addRuleSet(new NamingRuleSet("Server/Service/Engine/Host/Context/"));
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message