craigmcc 01/03/17 11:46:42
Modified: catalina/src/share/org/apache/catalina/core Constants.java
StandardWrapper.java
Log:
Modify the special case treatment of loading the Jasper servlet so that it
works when you use <jsp-file> declarations in web.xml, as well as for the
usual servlet declaration. This was broken by the class loader revisions
done previously to deal with package sealing violations.
Revision Changes Path
1.5 +5 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constants.java 2000/09/02 00:50:02 1.4
+++ Constants.java 2001/03/17 19:46:41 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java,v
1.4 2000/09/02 00:50:02 craigmcc Exp $
- * $Revision: 1.4 $
- * $Date: 2000/09/02 00:50:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/Constants.java,v
1.5 2001/03/17 19:46:41 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/03/17 19:46:41 $
*
* ====================================================================
*
@@ -71,6 +71,8 @@
public static final int MAJOR_VERSION = 2;
public static final int MINOR_VERSION = 3;
+ public static final String JSP_SERVLET_CLASS =
+ "org.apache.jasper.servlet.JspServlet";
public static final String JSP_SERVLET_NAME = "jsp";
}
1.15 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
Index: StandardWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StandardWrapper.java 2001/02/19 01:13:57 1.14
+++ StandardWrapper.java 2001/03/17 19:46:41 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.14 2001/02/19 01:13:57 glenn Exp $
- * $Revision: 1.14 $
- * $Date: 2001/02/19 01:13:57 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
1.15 2001/03/17 19:46:41 craigmcc Exp $
+ * $Revision: 1.15 $
+ * $Date: 2001/03/17 19:46:41 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* make them efficient are counter-productive.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.14 $ $Date: 2001/02/19 01:13:57 $
+ * @version $Revision: 1.15 $ $Date: 2001/03/17 19:46:41 $
*/
public final class StandardWrapper
@@ -725,7 +725,7 @@
}
// Special case class loader for the Jasper JSP servlet
- if (this.name.equals(Constants.JSP_SERVLET_NAME)) {
+ if (actualClass.equals(Constants.JSP_SERVLET_CLASS)) {
if (jasperLoader == null) {
jasperLoader = createJasperLoader(classLoader);
// Preload below class to prevent defineClassInPackage
