From 1308dd4c013bc3df42d1a0f72d85ab0b7a20327d Mon Sep 17 00:00:00 2001 From: adammurdoch Date: Sun, 7 Apr 2002 10:19:27 +0000 Subject: [PATCH] Axed todo.types.FileSet. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272269 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/antlib/build/Checksum.java | 2 +- .../antlib/build/UpToDateCondition.java | 2 +- .../java/org/apache/antlib/file/CopyTask.java | 2 +- .../java/org/apache/antlib/file/Delete.java | 2 +- .../java/org/apache/antlib/file/Touch.java | 2 +- .../org/apache/antlib/security/SignJar.java | 2 +- .../apache/antlib/xml/XMLValidateTask.java | 2 +- .../apache/myrmidon/framework/file/Path.java | 2 +- .../framework/java/JavaRuntimeClassPath.java | 2 +- .../org/apache/tools/todo/taskdefs/Cab.java | 6 +- .../apache/tools/todo/taskdefs/DependSet.java | 2 +- .../tools/todo/taskdefs/MatchingTask.java | 2 +- .../apache/tools/todo/taskdefs/SQLExec.java | 2 +- .../tools/todo/taskdefs/archive/Expand.java | 3 +- .../todo/taskdefs/archive/TarFileSet.java | 2 +- .../tools/todo/taskdefs/archive/Zip.java | 2 +- .../todo/taskdefs/archive/ZipFileSet.java | 4 +- .../tools/todo/taskdefs/i18n/Translate.java | 4 +- .../javac/DefaultCompilerAdapter.java | 2 +- .../tools/todo/taskdefs/javadoc/Javadoc.java | 2 +- .../tools/todo/taskdefs/junit/BatchTest.java | 2 +- .../taskdefs/junit/XMLResultAggregator.java | 2 +- .../metamata/AbstractMetamataTask.java | 2 +- .../apache/tools/todo/taskdefs/net/FTP.java | 2 +- .../tools/todo/taskdefs/net/MimeMail.java | 2 +- .../tools/todo/taskdefs/perforce/P4Add.java | 4 +- .../tools/todo/taskdefs/sitraka/CovMerge.java | 4 +- .../tools/todo/taskdefs/sitraka/Coverage.java | 2 +- .../todo/taskdefs/text/ReplaceRegExp.java | 4 +- .../org/apache/tools/todo/types/FileSet.java | 39 ------------- .../apache/tools/todo/types/ScannerUtil.java | 57 +------------------ 31 files changed, 32 insertions(+), 137 deletions(-) delete mode 100644 proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileSet.java diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java b/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java index 08c3885e3..f7ebfebe0 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java @@ -22,8 +22,8 @@ import java.util.Hashtable; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.AbstractMatchingTask; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/build/UpToDateCondition.java b/proposal/myrmidon/src/java/org/apache/antlib/build/UpToDateCondition.java index aaf187139..3c7b40f85 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/build/UpToDateCondition.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/build/UpToDateCondition.java @@ -13,9 +13,9 @@ import java.util.Iterator; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; +import org.apache.myrmidon.framework.FileSet; import org.apache.myrmidon.framework.conditions.Condition; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; import org.apache.tools.todo.types.SourceFileScanner; import org.apache.tools.todo.util.mappers.MergingMapper; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java index ab92cf20a..ae8ae12bd 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java @@ -19,8 +19,8 @@ import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.FileNameMapper; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; import org.apache.tools.todo.types.SourceFileScanner; import org.apache.tools.todo.util.mappers.IdentityMapper; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java index e57212c24..178c64f52 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java @@ -13,8 +13,8 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java index eb90c4e7e..615531914 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java @@ -18,8 +18,8 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java index c1a5119f6..ffbff2281 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java @@ -16,9 +16,9 @@ import java.util.zip.ZipFile; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java index e07ee71a6..5b83b969c 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java @@ -17,8 +17,8 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java index 28cc67cee..f9cdf43c7 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/file/Path.java @@ -12,10 +12,10 @@ import java.util.ArrayList; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.DataType; +import org.apache.myrmidon.framework.FileSet; import org.apache.myrmidon.framework.file.ArrayFileList; import org.apache.myrmidon.framework.file.FileList; import org.apache.tools.todo.util.FileUtils; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.ScannerUtil; diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/JavaRuntimeClassPath.java b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/JavaRuntimeClassPath.java index 9a83eac7f..6abd5b553 100644 --- a/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/JavaRuntimeClassPath.java +++ b/proposal/myrmidon/src/java/org/apache/myrmidon/framework/java/JavaRuntimeClassPath.java @@ -9,9 +9,9 @@ package org.apache.myrmidon.framework.java; import org.apache.myrmidon.framework.file.FileList; import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.FileSet; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; -import org.apache.tools.todo.types.FileSet; import org.apache.aut.nativelib.Os; import java.util.Locale; import java.io.File; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java index 3bd8af5e5..cc006270b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/Cab.java @@ -14,16 +14,12 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Iterator; -import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.Execute; -import org.apache.tools.todo.taskdefs.MatchingTask; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java index c17e1a943..01149fad7 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/DependSet.java @@ -13,8 +13,8 @@ import java.util.Date; import java.util.Iterator; import org.apache.aut.nativelib.Os; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; import org.apache.tools.todo.types.SimpleFileList; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java index 06c627fbd..e48a8e937 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/MatchingTask.java @@ -12,8 +12,8 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Pattern; import org.apache.myrmidon.framework.PatternSet; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java index 0f36d37aa..da59f16e1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/SQLExec.java @@ -34,9 +34,9 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.EnumeratedAttribute; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java index be45d0d22..56dd88e9f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Expand.java @@ -18,12 +18,11 @@ import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.io.IOUtil; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; +import org.apache.myrmidon.framework.FileSet; import org.apache.myrmidon.framework.PatternSet; import org.apache.myrmidon.framework.PatternUtil; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java index 8cbc4cfaf..3cfd7fda2 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/TarFileSet.java @@ -7,7 +7,7 @@ */ package org.apache.tools.todo.taskdefs.archive; -import org.apache.tools.todo.types.FileSet; +import org.apache.myrmidon.framework.FileSet; public class TarFileSet extends FileSet diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java index 2b1d444d2..89c26915f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Zip.java @@ -24,10 +24,10 @@ import org.apache.avalon.excalibur.io.IOUtil; import org.apache.excalibur.zip.ZipEntry; import org.apache.excalibur.zip.ZipOutputStream; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; import org.apache.tools.todo.types.FileScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; import org.apache.tools.todo.types.SourceFileScanner; import org.apache.tools.todo.util.mappers.MergingMapper; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java index 054a6a0a8..29f8be309 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/ZipFileSet.java @@ -8,7 +8,7 @@ package org.apache.tools.todo.taskdefs.archive; import java.io.File; -import org.apache.tools.todo.types.FileSet; +import org.apache.myrmidon.framework.FileSet; /** * A ZipFileSet is a FileSet with extra attributes useful in the context of @@ -57,7 +57,7 @@ public class ZipFileSet * Set the source Zip file for the zipfileset. Prevents both "dir" and "src" * from being specified. * - * @param srcFile The zip file from which to extract entries. + * @param src The zip file from which to extract entries. */ public void setSrc( final File src ) { diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/i18n/Translate.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/i18n/Translate.java index 6f5135266..0c4540ab3 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/i18n/Translate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/i18n/Translate.java @@ -20,11 +20,9 @@ import java.util.Hashtable; import java.util.Locale; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java index aca414822..dd3257116 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javac/DefaultCompilerAdapter.java @@ -16,10 +16,10 @@ import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.Commandline; import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.util.FileUtils; import org.apache.aut.nativelib.PathUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java index be44d51fc..8d4579292 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/javadoc/Javadoc.java @@ -21,9 +21,9 @@ import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; import org.apache.myrmidon.framework.Pattern; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.myrmidon.framework.file.Path; import org.apache.myrmidon.framework.file.FileListUtil; import org.apache.tools.todo.types.ScannerUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/BatchTest.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/BatchTest.java index 161776154..bdea85616 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/BatchTest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/BatchTest.java @@ -12,8 +12,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java index 55f90d7d8..01e4b7e04 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/junit/XMLResultAggregator.java @@ -21,8 +21,8 @@ import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java index 578da0780..865f5b1c2 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/metamata/AbstractMetamataTask.java @@ -20,8 +20,8 @@ import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.java.ExecuteJava; import org.apache.tools.todo.types.Argument; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.myrmidon.framework.file.Path; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java index d1be4e508..231911c74 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/FTP.java @@ -25,8 +25,8 @@ import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.api.TaskException; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.FileScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java index d4e291ab5..05ed3110e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/net/MimeMail.java @@ -26,8 +26,8 @@ import javax.mail.internet.MimeMultipart; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/perforce/P4Add.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/perforce/P4Add.java index d03a4cfbb..16f0a08fc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/perforce/P4Add.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/perforce/P4Add.java @@ -10,10 +10,8 @@ package org.apache.tools.todo.taskdefs.perforce; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovMerge.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovMerge.java index f0b7e2e31..9390c4fb0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovMerge.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/CovMerge.java @@ -13,14 +13,12 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.Random; -import org.apache.aut.nativelib.ExecManager; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.framework.Execute; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.Commandline; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java index 9f8c131e5..1d901e519 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/sitraka/Coverage.java @@ -16,9 +16,9 @@ import java.util.ArrayList; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.framework.Execute; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.Argument; import org.apache.tools.todo.types.Commandline; -import org.apache.tools.todo.types.FileSet; import org.apache.myrmidon.framework.file.Path; import org.apache.aut.nativelib.PathUtil; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java index b57b5c209..5795daf35 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/text/ReplaceRegExp.java @@ -18,12 +18,10 @@ import java.io.PrintWriter; import java.util.ArrayList; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.TaskContext; +import org.apache.myrmidon.framework.FileSet; import org.apache.tools.todo.types.DirectoryScanner; -import org.apache.tools.todo.types.FileSet; import org.apache.tools.todo.types.ScannerUtil; import org.apache.tools.todo.util.regexp.Regexp; -import org.apache.tools.todo.taskdefs.text.RegularExpression; /** * 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileSet.java
deleted file mode 100644
index d81545427..000000000
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/FileSet.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
- *
- * This software is published under the terms of the Apache Software License
- * version 1.1, a copy of which has been included with this distribution in
- * the LICENSE.txt file.
- */
-package org.apache.tools.todo.types;
-
-/**
- * Moved out of MatchingTask to make it a standalone object that could be
- * referenced (by scripts for example).
- *
- * @author Arnout J. Kuiper ajkuiper@wxs.nl
- * @author Stefano Mazzocchi 
- *      stefano@apache.org
- * @author Sam Ruby rubys@us.ibm.com
- * @author Jon S. Stevens jon@clearink.com
- * @author Stefan Bodewig
- * @author Magesh Umasankar
- */
-public class FileSet
-    extends org.apache.myrmidon.framework.FileSet
-{
-    private boolean m_isCaseSensitive = true;
-
-    /**
-     * Sets case sensitivity of the file system
-     */
-    public void setCaseSensitive( final boolean isCaseSensitive )
-    {
-        m_isCaseSensitive = isCaseSensitive;
-    }
-
-    public boolean isCaseSensitive()
-    {
-        return m_isCaseSensitive;
-    }
-}
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java
index 4ba81346f..ddc58fa15 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/types/ScannerUtil.java
@@ -13,12 +13,12 @@ import java.util.StringTokenizer;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.PatternUtil;
+import org.apache.myrmidon.framework.FileSet;
 import org.apache.tools.todo.taskdefs.archive.TarFileSet;
 import org.apache.tools.todo.taskdefs.archive.ZipFileSet;
 import org.apache.tools.todo.taskdefs.archive.ZipScanner;
 import org.apache.tools.todo.types.DirectoryScanner;
 import org.apache.tools.todo.types.FileScanner;
-import org.apache.tools.todo.types.FileSet;
 
 /**
  *
@@ -534,32 +534,6 @@ public class ScannerUtil
         }
     }
 
-    public static void setupDirectoryScanner( final org.apache.myrmidon.framework.FileSet set,
-                                              final FileScanner scanner,
-                                              final TaskContext context )
-        throws TaskException
-    {
-        if( null == scanner )
-        {
-            final String message = "ds cannot be null";
-            throw new IllegalArgumentException( message );
-        }
-
-        scanner.setBasedir( set.getDir() );
-
-        /*final String message = "FileSet: Setup file scanner in dir " +
-            set.getDir() + " with " + set;
-        getLogger().debug( message );*/
-
-        scanner.setIncludes( PatternUtil.getIncludePatterns( set, context ) );
-        scanner.setExcludes( PatternUtil.getExcludePatterns( set, context ) );
-        if( set.includeDefaultExcludes() )
-        {
-            scanner.addDefaultExcludes();
-        }
-        scanner.setCaseSensitive( true );
-    }
-
     public static void setupDirectoryScanner( final FileSet set,
                                               final FileScanner scanner,
                                               final TaskContext context )
@@ -583,7 +557,7 @@ public class ScannerUtil
         {
             scanner.addDefaultExcludes();
         }
-        scanner.setCaseSensitive( set.isCaseSensitive() );
+        scanner.setCaseSensitive( true );
     }
 
     public static DirectoryScanner getDirectoryScanner( final FileSet set )
@@ -613,33 +587,6 @@ public class ScannerUtil
         return scanner;
     }
 
-    public static DirectoryScanner getDirectoryScanner( final org.apache.myrmidon.framework.FileSet set )
-        throws TaskException
-    {
-        final File dir = set.getDir();
-        if( null == dir )
-        {
-            final String message = "No directory specified for fileset.";
-            throw new TaskException( message );
-        }
-
-        if( !dir.exists() )
-        {
-            final String message = dir.getAbsolutePath() + " not found.";
-            throw new TaskException( message );
-        }
-        if( !dir.isDirectory() )
-        {
-            final String message = dir.getAbsolutePath() + " is not a directory.";
-            throw new TaskException( message );
-        }
-
-        final DirectoryScanner scanner = new DirectoryScanner();
-        setupDirectoryScanner( set, scanner, null );
-        scanner.scan();
-        return scanner;
-    }
-
     public static DirectoryScanner getZipScanner( final ZipFileSet set )
         throws TaskException
     {