tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup ContextConfig.java
Date Fri, 01 Sep 2000 23:30:02 GMT
craigmcc    00/09/01 16:30:01

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Correct the parsing of <resource-ref> entries in the application deployment
  descriptor.
  
  Revision  Changes    Path
  1.10      +8 -6      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ContextConfig.java	2000/08/24 22:15:58	1.9
  +++ ContextConfig.java	2000/09/01 23:30:00	1.10
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.9 2000/08/24 22:15:58 craigmcc Exp $
  - * $Revision: 1.9 $
  - * $Date: 2000/08/24 22:15:58 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.10 2000/09/01 23:30:00 craigmcc Exp $
  + * $Revision: 1.10 $
  + * $Date: 2000/09/01 23:30:00 $
    *
    * ====================================================================
    *
  @@ -108,7 +108,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.9 $ $Date: 2000/08/24 22:15:58 $
  + * @version $Revision: 1.10 $ $Date: 2000/09/01 23:30:00 $
    */
   
   public final class ContextConfig
  @@ -451,8 +451,10 @@
   
   
   	mapper.addRule("web-app/resource-ref",
  -		       mapper.addChild("addResource",
  -				       "org.apache.catalina.deploy.ContextResource"));
  +            mapper.objectCreate("org.apache.catalina.deploy.ContextResource"));
  +        mapper.addRule("web-app/resource-ref",
  +		mapper.addChild("addResource",
  +			        "org.apache.catalina.deploy.ContextResource"));
   	mapper.addRule("web-app/resource-ref/description",
   		       mapper.methodSetter("setDescription", 0));
   	mapper.addRule("web-app/resource-ref/res-auth",
  
  
  

Mime
View raw message