SOURCES: objectweb-anttask-ant.patch (NEW) - fix for ant 1.7 (base...

[qboosh]

Author: qboosh                       Date: Mon Jan 14 21:35:47 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix for ant 1.7 (based on ALT Linux patch)

---- Files affected:
SOURCES:
   objectweb-anttask-ant.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/objectweb-anttask-ant.patch
diff -u /dev/null SOURCES/objectweb-anttask-ant.patch:1.1
--- /dev/null	Mon Jan 14 22:35:47 2008
+++ SOURCES/objectweb-anttask-ant.patch	Mon Jan 14 22:35:42 2008
@@ -0,0 +1,31 @@
+--- objectweb-anttask/src/org/objectweb/util/ant/MultipleCopy.java.orig	2008-01-14 22:10:02.450409267 +0100
++++ objectweb-anttask/src/org/objectweb/util/ant/MultipleCopy.java	2008-01-14 22:11:23.699039363 +0100
+@@ -10,6 +10,7 @@ import org.apache.tools.ant.Project;
+ import org.apache.tools.ant.taskdefs.Copy;
+ import org.apache.tools.ant.types.FileSet;
+ import org.apache.tools.ant.types.PatternSet;
++import org.apache.tools.ant.types.ResourceCollection;
+ 
+ import java.io.File;
+ import java.util.StringTokenizer;
+@@ -101,8 +102,10 @@ public class MultipleCopy extends Copy {
+ 		}
+ 
+ 		// deal with the filesets
+-		for (int i = 0; i < filesets.size(); i++) {
+-			FileSet fs = (FileSet) filesets.elementAt(i);
++		for (int i = 0; i < rcs.size(); i++) {
++			ResourceCollection rc = (ResourceCollection) rcs.elementAt(i);
++			if(rc instanceof FileSet && rc.isFilesystemOnly()) {
++			FileSet fs = (FileSet) rc;
+ 			DirectoryScanner ds = fs.getDirectoryScanner(getProject());
+ 			File fromDir = fs.getDir(getProject());
+ 
+@@ -110,6 +113,7 @@ public class MultipleCopy extends Copy {
+ 			String[] srcDirs = ds.getIncludedDirectories();
+ 
+ 			scan(fromDir, destDir, srcFiles, srcDirs);
++			}
+ 		}
+ 
+ 		// do all the copy operations now...
================================================================