Author: kkolinko
Date: Tue Jan 28 16:10:24 2014
New Revision: 1562103
URL: http://svn.apache.org/r1562103
Log:
Forward-port r1561625 from Tomcat 6.
This aligns Tomcat 7 with Tomcats 6 and 8 and provides a fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=55166
Change place where JSP schemas are in servlet-api.jar
so that now they are in the same directory as the rest of Java EE schemas.
It is followup to r1560931. I am not changing DigesterFactory.java in
case the schemas are in the old location. E.g. if someone runs tests from within
Eclipse IDE which compiler does not know that the files had to be copied.
Modified:
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1562103&r1=1562102&r2=1562103&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Jan 28 16:10:24 2014
@@ -288,8 +288,6 @@
<include name="javax/servlet/descriptor/*" />
<include name="javax/servlet/http/*" />
<include name="javax/servlet/resources/*" />
- <include name="javax/servlet/jsp/resources/*" />
- <exclude name="javax/servlet/jsp/resources/jspxml*" />
</patternset>
<patternset id="files.jsp-api">
@@ -626,6 +624,13 @@
<include name="**/*.xml"/>
</fileset>
</copy>
+ <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
+ <copy todir="${tomcat.classes}/javax/servlet/resources"
encoding="ISO-8859-1">
+ <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
+ <include name="*" />
+ <exclude name="jspxml*" />
+ </fileset>
+ </copy>
</target>
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1562103&r1=1562102&r2=1562103&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 28 16:10:24 2014
@@ -224,14 +224,15 @@
<subsection name="Extras">
<changelog>
<fix>
- <bug>56039</bug>: Enable the JmxRemoteLifecycleListener to work over
- SSL. Patch by esengstrom. (markt)
+ <bug>55166</bug>, <bug>56045</bug>: Copy the XML schemas used for
+ validation that are packaged in jsp-api.jar to servlet-api.jar so that
+ an embedded Tomcat instance can start without Jasper being available.
+ This also enables validation to work without Jasper being available.
+ (markt/kkolinko)
</fix>
<fix>
- <bug>56045</bug>: Copy the XML schemas used for validation that are
- packaged in jsp-api.jar to servlet-api.jar so that an embedded Tomcat
- instance can start without Jasper being available. This also enables
- validation to work without Jasper being available. (markt)
+ <bug>56039</bug>: Enable the JmxRemoteLifecycleListener to work over
+ SSL. Patch by esengstrom. (markt)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
