craigmcc    00/10/21 06:35:01

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Add configuration for the <display-name> element of web.xml.
  
  Revision  Changes    Path
  1.27      +8 -5      
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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ContextConfig.java        2000/10/18 01:56:46     1.26
  +++ ContextConfig.java        2000/10/21 13:35:00     1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
 1.26 2000/10/18 01:56:46 craigmcc Exp $
  - * $Revision: 1.26 $
  - * $Date: 2000/10/18 01:56:46 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
 1.27 2000/10/21 13:35:00 craigmcc Exp $
  + * $Revision: 1.27 $
  + * $Date: 2000/10/21 13:35:00 $
    *
    * ====================================================================
    *
  @@ -117,7 +117,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.26 $ $Date: 2000/10/18 01:56:46 $
  + * @version $Revision: 1.27 $ $Date: 2000/10/21 13:35:00 $
    */
   
   public final class ContextConfig
  @@ -439,6 +439,9 @@
        mapper.addRule("web-app/context-param/param-value",
                       mapper.methodParam(1));
   
  +        mapper.addRule("web-app/display-name",
  +                       mapper.methodSetter("setDisplayName", 0));
  +
        mapper.addRule("web-app/distributable",
                       mapper.methodSetter("setDistributable", 0));
   
  @@ -1039,7 +1042,7 @@
                   return (false);
               mapper.readXml(stream, context);
               stream.close();
  -            return (true);            
  +            return (true);
           } catch (Exception e) {
               if (debug >= 2)
                   log("    tldConfigTld(" + resourcePath + "): " + e);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to