Author: markt
Date: Mon Jan 27 10:14:15 2014
New Revision: 1561625

URL: http://svn.apache.org/r1561625
Log:
Fix error when running in strict servlet compliance mode with Java 5.
See "Tagging 6.0.39" thread on dev list.
By the way, it fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=55166
Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1561625&r1=1561624&r2=1561625&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jan 27 10:14:15 2014
@@ -28,12 +28,7 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix error when running in strict servlet compliance mode with Java 5.
-  See "Tagging 6.0.39" thread on dev list.
-  By the way, it fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=55166
-  
https://people.apache.org/~kkolinko/patches/2014-01-26_tc6_schemas_Java5.patch
-  +1: kkolinko, markt, rjung
-  -1:
+None
 
 
 PATCHES/ISSUES THAT ARE STALLED:

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1561625&r1=1561624&r2=1561625&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Mon Jan 27 10:14:15 2014
@@ -159,6 +159,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>
 
@@ -177,8 +184,6 @@
     <include name="javax/servlet/*" />
     <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">

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1561625&r1=1561624&r2=1561625&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jan 27 10:14:15 2014
@@ -44,6 +44,14 @@
  General, Catalina, Coyote, Jasper, Cluster, Web applications, Other
 -->
 <section name="Tomcat 6.0.39 (markt)">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>55166</bug>: Fix regression that broke XML validation when running
+        on some Java 5 JVMs. (kkolinko)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Coyote">
     <changelog>
       <fix>



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

Reply via email to