Return-Path: 
 <dev-return-69084-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 73728 invoked from network); 28 Sep 2005 18:38:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 28 Sep 2005 18:38:57 -0000
Received: (qmail 49698 invoked by uid 500); 28 Sep 2005 18:38:55 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 49649 invoked by uid 500); 28 Sep 2005 18:38:55 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 49636 invoked by uid 500); 28 Sep 2005 18:38:55 -0000
Received: (qmail 49633 invoked by uid 99); 28 Sep 2005 18:38:55 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 28 Sep 2005 11:38:54 -0700
Received: (qmail 68620 invoked by uid 65534); 28 Sep 2005 18:38:33 -0000
Message-ID: <20050928183833.68568.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r292245 - in /ant/core/trunk:
 docs/manual/CoreTasks/subant.html
 src/main/org/apache/tools/ant/taskdefs/SubAnt.java
Date: Wed, 28 Sep 2005 18:38:33 -0000
To: ant-cvs@apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: bodewig
Date: Wed Sep 28 11:38:27 2005
New Revision: 292245

URL: http://svn.apache.org/viewcvs?rev=292245&view=rev
Log:
resource collection support for subant

Modified:
    ant/core/trunk/docs/manual/CoreTasks/subant.html
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java

Modified: ant/core/trunk/docs/manual/CoreTasks/subant.html
URL: http://svn.apache.org/viewcvs/ant/core/trunk/docs/manual/CoreTasks/subant.html?rev=292245&r1=292244&r2=292245&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/subant.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/subant.html Wed Sep 28 11:38:27 2005
@@ -271,6 +271,24 @@
       <tr><td>&nbsp;</td></tr>
       <tr><td bgcolor="#828DA6">
         <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
+          <strong>any filesystem based <a href="../CoreTypes/resources.html#collection">resource collection</a></strong></font>
+      </td></tr>
+      <tr><td><blockquote>
+        This includes <code>&lt;fileset&gt;</code>,
+        <code>&lt;dirset&gt;</code> and <code>&lt;filelist&gt;</code>
+        which are the nested resource collections supported prior
+        to Ant 1.7.
+ <!-- Ignore -->
+ <!-- Ignore -->
+
+      </blockquote></td></tr>
+    </table>
+    <!-- End Element -->
+    <!-- Start Element -->
+    <table border="0" cellspacing="0" cellpadding="2" width="100%">
+      <tr><td>&nbsp;</td></tr>
+      <tr><td bgcolor="#828DA6">
+        <font color="#ffffff" face="arial,helvetica.sanserif" size="-1">
           <strong>dirset</strong> (org.apache.tools.ant.types.DirSet)</font>
       </td></tr>
       <tr><td><blockquote>

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java
URL: http://svn.apache.org/viewcvs/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java?rev=292245&r1=292244&r2=292245&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/SubAnt.java Wed Sep 28 11:38:27 2005
@@ -32,6 +32,7 @@
 import org.apache.tools.ant.types.FileList;
 import org.apache.tools.ant.types.PropertySet;
 import org.apache.tools.ant.types.Reference;
+import org.apache.tools.ant.types.ResourceCollection;
 
 
 /**
@@ -419,7 +420,7 @@
      * @param  set the directory set to add.
      */
     public void addDirset(DirSet set) {
-        getBuildpath().addDirset(set);
+        add(set);
     }
 
     /**
@@ -432,7 +433,7 @@
      * @param  set the file set to add.
      */
     public void addFileset(FileSet set) {
-        getBuildpath().addFileset(set);
+        add(set);
     }
 
     /**
@@ -444,7 +445,17 @@
      * @param  list the file list to add.
      */
     public void addFilelist(FileList list) {
-        getBuildpath().addFilelist(list);
+        add(list);
+    }
+
+    /**
+     * Adds a resource collection to the implicit build path.
+     *
+     * @param  rc the resource collection to add.
+     * @since Ant 1.7
+     */
+    public void add(ResourceCollection rc) {
+        getBuildpath().add(rc);
     }
 
     /**



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