Author: drazzib Date: 2011-09-22 13:13:51 +0000 (Thu, 22 Sep 2011) New Revision: 15001
Added: trunk/libfreemarker-java/debian/patches/dtd_location.diff Modified: trunk/libfreemarker-java/debian/changelog trunk/libfreemarker-java/debian/patches/series Log: d/patches/dtd_location.diff: Fix resolving of DTD when loading taglibs. Modified: trunk/libfreemarker-java/debian/changelog =================================================================== --- trunk/libfreemarker-java/debian/changelog 2011-09-22 12:27:48 UTC (rev 15000) +++ trunk/libfreemarker-java/debian/changelog 2011-09-22 13:13:51 UTC (rev 15001) @@ -11,8 +11,9 @@ * Add Depends and B-D on libslf4j-java and libcommons-logging-java. * Wrap and sort Build-Depends and Depends. * d/copyright: Use DEP-5 format. + * d/patches/dtd_location.diff: Fix resolving of DTD when loading taglibs. - -- Damien Raude-Morvan <[email protected]> Thu, 22 Sep 2011 13:59:10 +0200 + -- Damien Raude-Morvan <[email protected]> Thu, 22 Sep 2011 15:09:03 +0200 libfreemarker-java (2.3.16-3) unstable; urgency=low Added: trunk/libfreemarker-java/debian/patches/dtd_location.diff =================================================================== --- trunk/libfreemarker-java/debian/patches/dtd_location.diff (rev 0) +++ trunk/libfreemarker-java/debian/patches/dtd_location.diff 2011-09-22 13:13:51 UTC (rev 15001) @@ -0,0 +1,50 @@ +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 <[email protected]> +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) Modified: trunk/libfreemarker-java/debian/patches/series =================================================================== --- trunk/libfreemarker-java/debian/patches/series 2011-09-22 12:27:48 UTC (rev 15000) +++ trunk/libfreemarker-java/debian/patches/series 2011-09-22 13:13:51 UTC (rev 15001) @@ -5,3 +5,4 @@ jsp_api.diff def-jdk-doc.patch disable-jython-extension.patch +dtd_location.diff _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
