Author: markt
Date: Mon Jul 8 09:33:59 2013
New Revision: 1500632
URL: http://svn.apache.org/r1500632
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55166
Move the JSP descriptor and tag library descriptor schema defintion files from
jsp-api.jar to servlet-api.jar so relative includes between the J2EE, Servlet
and JSP schemas are correctly resolved.
Added:
tomcat/trunk/java/javax/servlet/resources/jsp_2_0.xsd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd
tomcat/trunk/java/javax/servlet/resources/jsp_2_1.xsd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
tomcat/trunk/java/javax/servlet/resources/jsp_2_2.xsd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
tomcat/trunk/java/javax/servlet/resources/jsp_2_3.xsd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_3.xsd
tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_1.dtd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd
tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_1_2.dtd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd
tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_0.xsd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
tomcat/trunk/java/javax/servlet/resources/web-jsptaglibrary_2_1.xsd
- copied unchanged from r1500589,
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
Removed:
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_0.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_1.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_2.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/jsp_2_3.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_0.xsd
tomcat/trunk/java/javax/servlet/jsp/resources/web-jsptaglibrary_2_1.xsd
tomcat/trunk/res/META-INF/jsp-api.jar.license
tomcat/trunk/res/META-INF/jsp-api.jar.notice
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/catalina/startup/Constants.java
tomcat/trunk/res/maven/tomcat-jsp-api.pom
tomcat/trunk/res/maven/tomcat-servlet-api.pom
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1500632&r1=1500631&r2=1500632&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Jul 8 09:33:59 2013
@@ -670,9 +670,7 @@
<jarIt jarfile="${jsp-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest"
- notice="${tomcat.manifests}/jsp-api.jar.notice"
- license="${tomcat.manifests}/jsp-api.jar.license" />
+ manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
<!-- EL 3.0 Implementation JAR File -->
<jarIt jarfile="${el-api.jar}"
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=1500632&r1=1500631&r2=1500632&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Constants.java Mon Jul 8
09:33:59 2013
@@ -89,22 +89,22 @@ public final class Constants {
public static final String JspSchemaPublicId_20 =
"jsp_2_0.xsd";
public static final String JspSchemaResourcePath_20 =
- "/javax/servlet/jsp/resources/jsp_2_0.xsd";
+ "/javax/servlet/resources/jsp_2_0.xsd";
public static final String JspSchemaPublicId_21 =
"jsp_2_1.xsd";
public static final String JspSchemaResourcePath_21 =
- "/javax/servlet/jsp/resources/jsp_2_1.xsd";
+ "/javax/servlet/resources/jsp_2_1.xsd";
public static final String JspSchemaPublicId_22 =
"jsp_2_2.xsd";
public static final String JspSchemaResourcePath_22 =
- "/javax/servlet/jsp/resources/jsp_2_2.xsd";
+ "/javax/servlet/resources/jsp_2_2.xsd";
public static final String JspSchemaPublicId_23 =
"jsp_2_3.xsd";
public static final String JspSchemaResourcePath_23 =
- "/javax/servlet/jsp/resources/jsp_2_3.xsd";
+ "/javax/servlet/resources/jsp_2_3.xsd";
// TLD
Modified: tomcat/trunk/res/maven/tomcat-jsp-api.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jsp-api.pom?rev=1500632&r1=1500631&r2=1500632&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jsp-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jsp-api.pom Mon Jul 8 09:33:59 2013
@@ -24,19 +24,9 @@
<url>http://tomcat.apache.org/</url>
<licenses>
<license>
- <name>
- Apache License, Version 2.0 and
- Common Development And Distribution License (CDDL) Version 1.0
- </name>
- <url>
- http://www.apache.org/licenses/LICENSE-2.0.txt and
- http://www.opensource.org/licenses/cddl1.txt
- </url>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
- <comments>
- The Apache License, version 2.0 applies to all files apart from
- jsp_2_2.xsd and jsp_2_3.xsd to which the CDDL version 1.0 applies.
- </comments>
</license>
</licenses>
<dependencies>
Modified: tomcat/trunk/res/maven/tomcat-servlet-api.pom
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-servlet-api.pom?rev=1500632&r1=1500631&r2=1500632&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-servlet-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-servlet-api.pom Mon Jul 8 09:33:59 2013
@@ -35,13 +35,24 @@
<distribution>repo</distribution>
<comments>
The Apache License, version 2.0 applies to all files apart from
- javaee_5.xsd, javaee_web_services_1_2.xsd,
- javaee_web_services_client_1_2.xsd, javaee_6.xsd,
- javaee_web_services_1_3.xsd, javaee_web_services_client_1_3.xsd,
- web-app_3_0.xsd, web-common_3_0.xsd, web-fragment_3_0.xsd,
javaee_7.xsd,
- javaee_web_services_1_4.xsd, javaee_web_services_client_1_4.xsd,
- web-app_3_1.xsd, web-common_3_1.xsd and web-fragment_3_1.xsd to which
- the CDDL version 1.0 applies.
+ javaee_5.xsd,
+ javaee_6.xsd,
+ javaee_7.xsd,
+ javaee_web_services_1_2.xsd,
+ javaee_web_services_client_1_2.xsd,
+ javaee_web_services_1_3.xsd,
+ javaee_web_services_client_1_3.xsd,
+ javaee_web_services_1_4.xsd,
+ javaee_web_services_client_1_4.xsd,
+ jsp_2_2.xsd,
+ jsp_2_3.xsd,
+ web-app_3_0.xsd,
+ web-common_3_0.xsd,
+ web-fragment_3_0.xsd,
+ web-app_3_1.xsd,
+ web-common_3_1.xsd and
+ web-fragment_3_1.xsd
+ to which the CDDL version 1.0 applies.
</comments>
</license>
</licenses>
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1500632&r1=1500631&r2=1500632&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 8 09:33:59 2013
@@ -223,6 +223,12 @@
<bug>54899</bug>: Provide an initial implementation of NetBeans
support.
Patch provided by Brian Burch. (markt)
</add>
+ <fix>
+ <bug>55166</bug>: Move the JSP descriptor and tag library descriptor
+ schema defintion files from jsp-api.jar to servlet-api.jar so relative
+ includes between the J2EE, Servlet and JSP schemas are correctly
+ resolved. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
