billbarker 01/11/28 19:06:05
Modified: src/facade22/org/apache/tomcat/facade JspInterceptor.java
WebXmlReader.java
Log:
Rationalize the setting of the default mapping for JSP pages.
With this code move, only JspInterceptor knows anything about JSP pages. In
particular, removing JspInterceptor from server.xml disables all support for *.jsp
files.
Revision Changes Path
1.32 +3 -0
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java
Index: JspInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/JspInterceptor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JspInterceptor.java 2001/11/27 03:54:35 1.31
+++ JspInterceptor.java 2001/11/29 03:06:05 1.32
@@ -298,6 +298,9 @@
public void contextInit(Context ctx)
throws TomcatException
{
+ if(ctx.getContainer("*.jsp") == null)
+ ctx.addServletMapping( "*.jsp", "jsp");
+
if( useJspServlet ) {
// prepare jsp servlet.
Handler jasper=ctx.getServletByName( "jsp" );
1.15 +0 -1
jakarta-tomcat/src/facade22/org/apache/tomcat/facade/WebXmlReader.java
Index: WebXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/facade22/org/apache/tomcat/facade/WebXmlReader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- WebXmlReader.java 2001/09/29 04:28:22 1.14
+++ WebXmlReader.java 2001/11/29 03:06:05 1.15
@@ -64,7 +64,6 @@
try {
// Defaults
- ctx.addServletMapping( "*.jsp", "jsp");
ctx.setSessionTimeOut( 30 );
// We may read a "default" web.xml from INSTALL/conf/web.xml -
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
