From 78b414381f8d0da9249558b3dd922319fa89c5fa Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 31 Jul 2000 13:30:20 +0000
Subject: [PATCH] Added nested <filesetref> element to <execon>.

Using

<execon ...>
  <filesetref refid="otherfileset" />
</execon>

you can reference a fileset with ID="otherfileset" defined anywhere
else in the build file.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267856 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/tools/ant/taskdefs/ExecuteOn.java  | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
index 853d05a32..48dd9f6af 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
@@ -79,6 +79,13 @@ public class ExecuteOn extends ExecTask {
         filesets.addElement(set);
     }
 
+    /**
+     * Adds a reference to a set of files (nested filesetref element).
+     */
+    public void addFilesetref(Reference ref) {
+        filesets.addElement(ref);
+    }
+
     /**
      * Shall the command work on all specified files in parallel?
      */
@@ -98,7 +105,22 @@ public class ExecuteOn extends ExecTask {
 
             Vector v = new Vector();
             for (int i=0; i<filesets.size(); i++) {
-                FileSet fs = (FileSet) filesets.elementAt(i);
+
+                Object o = filesets.elementAt(i);
+                FileSet fs = null;
+                if (o instanceof FileSet) {
+                    fs = (FileSet) o;
+                } else {
+                    Reference r = (Reference) o;
+                    o = r.getReferencedObject(project);
+                    if (o instanceof FileSet) {
+                        fs = (FileSet) o;
+                    } else {
+                        String msg = r.getRefId()+" doesn\'t denote a fileset";
+                        throw new BuildException(msg, location);
+                    }
+                }
+                
                 DirectoryScanner ds = fs.getDirectoryScanner(project);
                 String[] s = ds.getIncludedFiles();
                 for (int j=0; j<s.length; j++) {