cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper JspC.java

[remm]

remm        2003/06/30 15:10:00

  Modified:    jasper2/src/share/org/apache/jasper JspC.java
  Log:
  - Don't generate the comments (they can screw up the char encoding in case
    i18n is used) when including in an existing web.xml.
  
  Revision  Changes    Path
  1.47      +5 -5      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- JspC.java 26 Jun 2003 01:18:07 -0000      1.46
  +++ JspC.java 30 Jun 2003 22:10:00 -0000      1.47
  @@ -863,7 +863,7 @@
               if (webxmlLevel >= ALL_WEBXML) {
                   mapout.write(Localizer.getMessage("jspc.webxml.header"));
                   mapout.flush();
  -            } else if (webxmlLevel>= INC_WEBXML) {
  +            } else if ((webxmlLevel>= INC_WEBXML) && !addWebXmlMappings) {
                   mapout.write(Localizer.getMessage("jspc.webinc.header"));
                   mapout.flush();
               }
  @@ -881,7 +881,7 @@
                   mappingout.writeTo(mapout);
                   if (webxmlLevel >= ALL_WEBXML) {
                       mapout.write(Localizer.getMessage("jspc.webxml.footer"));
  -                } else if (webxmlLevel >= INC_WEBXML) {
  +                } else if ((webxmlLevel >= INC_WEBXML) && !addWebXmlMappings) {
                       mapout.write(Localizer.getMessage("jspc.webinc.footer"));
                   }
                   mapout.close();
  
  
  

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