resource collection support for subant

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

docs/manual/CoreTasks/subant.html

@@ -267,6 +267,24 @@
 
       <tr><td><blockquote>
     <!-- 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>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">

src/main/org/apache/tools/ant/taskdefs/SubAnt.java

@@ -32,6 +32,7 @@ import org.apache.tools.ant.types.FileSet;
 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 @@ public class SubAnt
      * @param  set the directory set to add.
      */
     public void addDirset(DirSet set) {
-        getBuildpath().addDirset(set);
+        add(set);
     }
 
     /**
@@ -432,7 +433,7 @@ public class SubAnt
      * @param  set the file set to add.
      */
     public void addFileset(FileSet set) {
-        getBuildpath().addFileset(set);
+        add(set);
     }
 
     /**
@@ -444,7 +445,17 @@ public class SubAnt
      * @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);
     }
 
     /**