Return-Path: 
 <dev-return-110224-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 32894 invoked from network); 8 Oct 2010 12:10:52 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 8 Oct 2010 12:10:52 -0000
Received: (qmail 42267 invoked by uid 500); 8 Oct 2010 12:10:52 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 41959 invoked by uid 500); 8 Oct 2010 12:10:50 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 41950 invoked by uid 99); 8 Oct 2010 12:10:49 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Oct 2010 12:10:49 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Oct 2010 12:10:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 061FA2388906; Fri,  8 Oct 2010 12:10:29 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
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 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101008121029.061FA2388906@eris.apache.org>

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