svn commit: r1500677 - in /tomcat/trunk/java/org/apache: catalina/startup/Constants.java jasper/Constants.java

[markt]

Author: markt
Date: Mon Jul  8 11:54:57 2013
New Revision: 1500677

URL: http://svn.apache.org/r1500677
Log:
Update paths to the tag library schema files

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/Constants.java
    tomcat/trunk/java/org/apache/jasper/Constants.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Constants.java?rev=1500677&r1=1500676&r2=1500677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Mon Jul  8 
11:54:57 2013
@@ -111,22 +111,22 @@ public final class Constants {
     public static final String TldDtdPublicId_11 =
         "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN";
     public static final String TldDtdResourcePath_11 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd";
+        "/javax/servlet/resources/web-jsptaglibrary_1_1.dtd";
 
     public static final String TldDtdPublicId_12 =
         "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
     public static final String TldDtdResourcePath_12 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
+        "/javax/servlet/resources/web-jsptaglibrary_1_2.dtd";
 
     public static final String TldSchemaPublicId_20 =
         "web-jsptaglibrary_2_0.xsd";
     public static final String TldSchemaResourcePath_20 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd";
+        "/javax/servlet/resources/web-jsptaglibrary_2_0.xsd";
 
     public static final String TldSchemaPublicId_21 =
         "web-jsptaglibrary_2_1.xsd";
     public static final String TldSchemaResourcePath_21 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd";
+        "/javax/servlet/resources/web-jsptaglibrary_2_1.xsd";
 
 
     // web.xml

Modified: tomcat/trunk/java/org/apache/jasper/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/Constants.java?rev=1500677&r1=1500676&r2=1500677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/trunk/java/org/apache/jasper/Constants.java Mon Jul  8 11:54:57 2013
@@ -127,11 +127,11 @@ public class Constants {
     private static final String TAGLIB_DTD_PUBLIC_ID_11 =
         "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN";
     private static final String TAGLIB_DTD_RESOURCE_PATH_11 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd";
+        "/javax/servlet/resources/web-jsptaglibrary_1_1.dtd";
     private static final String TAGLIB_DTD_PUBLIC_ID_12 =
         "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN";
     private static final String TAGLIB_DTD_RESOURCE_PATH_12 =
-        "/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd";
+        "/javax/servlet/resources/web-jsptaglibrary_1_2.dtd";
 
     /**
      * Public Id and the Resource path (of the cached copy)



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org