marcsaeg 01/09/08 13:54:51
Modified: src/share/org/apache/jasper Tag: tomcat_32 JspC.java
Log:
Fixes invalid servlet mapping in generated web.xml file.
PR: 3474, 3499
Submitted by: Blakeslee, Todd [[EMAIL PROTECTED]]
Revision Changes Path
No revision
No revision
1.15.2.4 +7 -7 jakarta-tomcat/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -u -r1.15.2.3 -r1.15.2.4
--- JspC.java 2001/01/12 04:46:58 1.15.2.3
+++ JspC.java 2001/09/08 20:54:51 1.15.2.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
1.15.2.3 2001/01/12 04:46:58 larryi Exp $
- * $Revision: 1.15.2.3 $
- * $Date: 2001/01/12 04:46:58 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/JspC.java,v
1.15.2.4 2001/09/08 20:54:51 marcsaeg Exp $
+ * $Revision: 1.15.2.4 $
+ * $Date: 2001/09/08 20:54:51 $
*
* ====================================================================
*
@@ -391,11 +391,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) {
