tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1005795 - in /tomcat/trunk: bin/catalina-tasks.xml build.xml webapps/docs/changelog.xml
Date Fri, 08 Oct 2010 12:10:28 GMT
Author: markt
Date: Fri Oct  8 12:10:28 2010
New Revision: 1005795

URL: http://svn.apache.org/viewvc?rev=1005795&view=rev
Log:
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. 

Modified:
    tomcat/trunk/bin/catalina-tasks.xml
    tomcat/trunk/build.xml
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/bin/catalina-tasks.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1005795&r1=1005794&r2=1005795&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Fri Oct  8 12:10:28 2010
@@ -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"/>

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1005795&r1=1005794&r2=1005795&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Oct  8 12:10:28 2010
@@ -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>

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1005795&r1=1005794&r2=1005795&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Oct  8 12:10:28 2010
@@ -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">



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


Mime
View raw message