You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by "Craig R. McClanahan" <cr...@apache.org> on 2001/09/07 20:04:07 UTC
Re: [PATCH] Fixes servlet-mapping in web.xml file generated by JspC
u sing the -webxml and -webinc options
Great minds think alike :-). I just committed exactly this fix, plus your
fix for the generated DOCTYPE heading. Thanks!
Craig
On Fri, 7 Sep 2001, Blakeslee, Todd wrote:
> Date: Fri, 7 Sep 2001 14:02:53 -0400
> From: "Blakeslee, Todd" <Bl...@diebold.com>
> Reply-To: tomcat-dev@jakarta.apache.org
> To: "'tomcat-dev@jakarta.apache.org'" <to...@jakarta.apache.org>
> Subject: [PATCH] Fixes servlet-mapping in web.xml file generated by JspC
> u sing the -webxml and -webinc options
>
> This patch fixes the following bug reports. Testing on Windows 2000 w/ SP2, JDK 1.3.1, and jakarta-tomcat-4.0-20010906.
>
> web.xml file generated by JspC is not valid as defined by DTD.
> http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3474
>
> Invalid url-pattern for servlet-mapping in web.xml file generated by JspC on Windows OS.
> http://nagoya.apache.org/bugzilla/show_bug.cgi?id=3499
>
> ----------------------------------------------------------------------
>
> cvs diff -u D:/Tomcat4-cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
> Index: D:/Tomcat4-cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java
> ===================================================================
> RCS file: /home/cvspublic/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java,v
> retrieving revision 1.8
> diff -u -r1.8 JspC.java
> --- D:/Tomcat4-cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java 2001/02/04 01:03:42 1.8
> +++ D:/Tomcat4-cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspC.java 2001/09/07 16:46:10
> @@ -400,11 +400,11 @@
> servletout.write("</servlet-class>\n\t</servlet>\n");
> }
> if (mappingout != null) {
> - mappingout.write("\n\t<servlet-mapping>\n\t\t<url-pattern>");
> - mappingout.write(file);
> - mappingout.write("</url-pattern>\n\t\t<servlet-name>");
> + mappingout.write("\n\t<servlet-mapping>\n\t\t<servlet-name>");
> mappingout.write(thisServletName);
> - mappingout.write("</servlet-name>\n\t</servlet-mapping>\n");
> + mappingout.write("</servlet-name>\n\t\t<url-pattern>");
> + mappingout.write(file.replace('\\', '/'));
> + mappingout.write("</url-pattern>\n\t</servlet-mapping>\n");
> }
> return true;
> } catch (JasperException je) {
>
> *****CVS exited normally with code 1*****
>
> ----------------------------------------------------------------------
> Todd R. Blakeslee [mailto:blakest@diebold.com]
>