Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50013

Correctly package classes from org.apache.tomcat.util.file and add the tomcat-util.jar to the class path for the Ant tasks. Based on a patch provided by Sylvain Laurent.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1005795 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/bin/catalina-tasks.xml b/bin/catalina-tasks.xml
index 9f92e81..88fa0d9 100644 (file)
--- a/bin/catalina-tasks.xml
+++ b/bin/catalina-tasks.xml
@@ -29,6 +29,7 @@
     <classpath>
       <fileset file="${catalina.home}/bin/tomcat-juli.jar"/>
       <fileset file="${catalina.home}/lib/tomcat-api.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
       <fileset file="${catalina.home}/lib/jasper.jar"/>
       <fileset file="${catalina.home}/lib/jasper-el.jar"/>
       <fileset file="${catalina.home}/lib/el-api.jar"/>

diff --git a/build.xml b/build.xml
index 78beca4..c7c9891 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -277,6 +277,7 @@
   </patternset>
 
   <patternset id="files.tomcat-util">
+    <include name="org/apache/tomcat/util/file/**" />
     <include name="org/apache/tomcat/util/res/**" />
     <include name="org/apache/tomcat/util/scan/**" />
   </patternset>
@@ -312,6 +313,7 @@
     <include name="org/apache/jk/**" />
     <include name="org/apache/tomcat/util/**" />
     <!-- Exclude the files shared between Catalina & Jasper -->
+    <exclude name="org/apache/tomcat/util/file/**" />
     <exclude name="org/apache/tomcat/util/res/**" />
     <exclude name="org/apache/tomcat/util/scan/**" />
   </patternset>

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 59a8fc3..4292836 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,16 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <fix>
+        <bug>50013</bug>: Correctly package classes from
+        <code>org.apache.tomcat.util.file</code> and add the tomcat-util.jar to
+        the class path for the Ant tasks. Based on a patch provided by
+        Sylvain Laurent. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.3 (markt)" rtext="not released">
   <subsection name="Catalina">