libfreemarker-java (2.3.18-1) dtd_location.diff

Description: Since */src/freemarker/ext/jsp/*.dtd and
 */src/freemarker/ext/jsp/*.xsd has been removed from orig tarball,
 resolve those files using classpath (into jsp-api-2.1.jar
 and servlet-api-2.5.jar)
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2011-09-22
Forwarded: no
Index: b/src/freemarker/ext/jsp/TaglibFactory.java
===================================================================
--- a/src/freemarker/ext/jsp/TaglibFactory.java
+++ b/src/freemarker/ext/jsp/TaglibFactory.java
@@ -688,25 +688,26 @@
     static
     {
         // JSP taglib 2.1
-        dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd", "web-jsptaglibrary_2_1.xsd");
+        dtds.put("http://java.sun.com/xml/ns/jee/web-jsptaglibrary_2_1.xsd", "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd");
         // JSP taglib 2.0
-        dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd", "web-jsptaglibrary_2_0.xsd");
+        dtds.put("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd", "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd");
         // JSP taglib 1.2
-        dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "web-jsptaglibrary_1_2.dtd");
-        dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd", "web-jsptaglibrary_1_2.dtd");
+        dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
+        dtds.put("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd");
         // JSP taglib 1.1
-        dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "web-jsptaglibrary_1_1.dtd");
-        dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd", "web-jsptaglibrary_1_1.dtd");
+        dtds.put("-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
+        dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
+        dtds.put("http://java.sun.com/j2ee/dtds/web-jsptaglib_1_1.dtd", "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd");
         // Servlet 2.5
-        dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd", "web-app_2_5.xsd");
+        dtds.put("http://java.sun.com/xml/ns/jee/web-app_2_5.xsd", "/javax/servlet/resources/web-app_2_5.xsd");
         // Servlet 2.4
-        dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd", "web-app_2_4.xsd");
+        dtds.put("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd", "/javax/servlet/resources/web-app_2_4.xsd");
         // Servlet 2.3
-        dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "web-app_2_3.dtd");
-        dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd", "web-app_2_3.dtd");
+        dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN", "/javax/servlet/resources/web-app_2_3.dtd");
+        dtds.put("http://java.sun.com/dtd/web-app_2_3.dtd", "/javax/servlet/resources/web-app_2_3.dtd");
         // Servlet 2.2
-        dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "web-app_2_2.dtd");
-        dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd", "web-app_2_2.dtd");
+        dtds.put("-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN", "/javax/servlet/resources/web-app_2_2.dtd");
+        dtds.put("http://java.sun.com/j2ee/dtds/web-app_2_2.dtd", "/javax/servlet/resources/web-app_2_2.dtd");
     }
     private static final class LocalTaglibDtds implements EntityResolver {
         public InputSource resolveEntity(String publicId, String systemId)