Return-Path: 
 <tomcat-dev-return-732-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 70278 invoked from network); 9 Nov 2001 00:56:02 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 9 Nov 2001 00:56:02 -0000
Received: (qmail 12589 invoked by uid 97); 8 Nov 2001 21:15:42 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 12573 invoked by uid 97); 8 Nov 2001 21:15:41 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 12562 invoked by uid 97); 8 Nov 2001 21:15:41 -0000
Date: 8 Nov 2001 21:03:27 -0000
Message-ID: <20011108210327.98236.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
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

remm        01/11/08 13:03:27

  Modified:    catalina/src/share/org/apache/catalina/startup Catalina.java
  Log:
  - Fix bugs in the digester rules.
  
  Revision  Changes    Path
  1.37      +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.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Catalina.java	2001/11/07 05:25:34	1.36
  +++ Catalina.java	2001/11/08 21:03:27	1.37
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.36 2001/11/07 05:25:34 remm Exp $
  - * $Revision: 1.36 $
  - * $Date: 2001/11/07 05:25:34 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -97,7 +97,7 @@
    * </u>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.36 $ $Date: 2001/11/07 05:25:34 $
  + * @version $Revision: 1.37 $ $Date: 2001/11/08 21:03:27 $
    */
   
   public class Catalina {
  @@ -346,7 +346,7 @@
                               "org.apache.catalina.LifecycleListener");
   
           // Add RuleSets for nested elements
  -        digester.addRuleSet(new NamingRuleSet("Server/GlobalResources/"));
  +        digester.addRuleSet(new NamingRuleSet("Server/GlobalNamingResources/"));
           digester.addRuleSet(new EngineRuleSet("Server/Service/"));
           digester.addRuleSet(new HostRuleSet("Server/Service/Engine/"));
           digester.addRuleSet(new ContextRuleSet("Server/Service/Engine/Default"));
  
  
  

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