You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2014/06/11 23:22:07 UTC

svn commit: r1602018 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/catalina-tasks.xml webapps/docs/changelog.xml

Author: kkolinko
Date: Wed Jun 11 21:22:06 2014
New Revision: 1602018

URL: http://svn.apache.org/r1602018
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56560
Fix NoClassDefFoundError when using Jasper Ant task.
Patch provided by M.Gemmell.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/bin/catalina-tasks.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=1602018&r1=1602017&r2=1602018&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 11 21:22:06 2014
@@ -28,14 +28,6 @@ None
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* https://issues.apache.org/bugzilla/show_bug.cgi?id=56560
-  Fix NoClassDefFoundError when using Ant
-  Fix the Jasper Ant task
-  Patch provided by  M Gemmell
-  https://issues.apache.org/bugzilla/attachment.cgi?id=31659&action=diff
-  +1: markt, kkolinko, schultz
-  -1:
-
 * Improvements to ChunkedInputFilter
   - Clean-up
   - i18n for ChunkedInputFilter error message

Modified: tomcat/tc6.0.x/trunk/bin/catalina-tasks.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/catalina-tasks.xml?rev=1602018&r1=1602017&r2=1602018&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/tc6.0.x/trunk/bin/catalina-tasks.xml Wed Jun 11 21:22:06 2014
@@ -34,6 +34,7 @@
       <fileset file="${catalina.home}/lib/jsp-api.jar"/>
       <fileset file="${catalina.home}/lib/servlet-api.jar"/>
       <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
     </classpath>
   </taskdef>
   <taskdef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">

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=1602018&r1=1602017&r2=1602018&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jun 11 21:22:06 2014
@@ -55,6 +55,11 @@
   <subsection name="Jasper">
     <changelog>
       <fix>
+        <bug>56560</bug>: Fix NoClassDefFoundError when using Jasper Ant task
+        defined by <code>catalina-tasks.xml</code> file. Patch provided by
+        M Gemmell. (kkolinko)
+      </fix>
+      <fix>
         <bug>56561</bug>: Avoid <code>NoSuchElementException</code> while
         handling attributes with empty string value. (violetagg)
       </fix>



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