craigmcc 01/07/17 13:47:01
Modified: jasper/src/share/org/apache/jasper Constants.java
jasper/src/share/org/apache/jasper/parser ParserUtils.java
Removed: jasper/src/share/org/apache/jasper/resources
web-jsptaglib_1_1.dtd web-jsptaglib_1_2.dtd
web_22.dtd web_23.dtd
Log:
Make Jasper depend on the DTDs from servlet.jar (in the same way that
Catalina was just changed) to avoid out-of-sync problems.
Revision Changes Path
1.12 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Constants.java 2001/07/17 04:21:13 1.11
+++ Constants.java 2001/07/17 20:46:52 1.12
@@ -158,11 +158,11 @@
public static final String TAGLIB_DTD_PUBLIC_ID_11 =
"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN";
public static final String TAGLIB_DTD_RESOURCE_PATH_11 =
- "/org/apache/jasper/resources/web-jsptaglib_1_1.dtd";
+ "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd";
public static final String TAGLIB_DTD_PUBLIC_ID_12 =
"-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
public static final String TAGLIB_DTD_RESOURCE_PATH_12 =
- "/org/apache/jasper/resources/web-jsptaglib_1_2.dtd";
+ "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
/**
* Public Id and the Resource path (of the cached copy)
@@ -171,11 +171,11 @@
public static final String WEBAPP_DTD_PUBLIC_ID_22 =
"-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN";
public static final String WEBAPP_DTD_RESOURCE_PATH_22 =
- "/org/apache/jasper/resources/web_22.dtd";
+ "/javax/servlet/resources/web-app_2_2.dtd";
public static final String WEBAPP_DTD_PUBLIC_ID_23 =
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN";
public static final String WEBAPP_DTD_RESOURCE_PATH_23 =
- "/org/apache/jasper/resources/web_23.dtd";
+ "/javax/servlet/resources/web-app_2_3.dtd";
/**
* List of the Public IDs that we cache, and their
1.3 +3 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser/ParserUtils.java
Index: ParserUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/parser/ParserUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserUtils.java 2001/02/18 02:18:15 1.2
+++ ParserUtils.java 2001/07/17 20:46:55 1.3
@@ -95,7 +95,7 @@
* use a separate class loader for the parser to be used.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.2 $ $Date: 2001/02/18 02:18:15 $
+ * @version $Revision: 1.3 $ $Date: 2001/07/17 20:46:55 $
*/
public class ParserUtils {
@@ -415,6 +415,8 @@
}
InputSource isrc =
new InputSource(input);
+ System.out.println("MyEntityResolver '" + publicId +
+ "' --> '" + resourcePath + "'");
return isrc;
}
}
