From f8ab615aea394cd89a8190fa4aa43124030c0c39 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 13 Jan 2002 00:04:26 +0000 Subject: [PATCH] Move all the generic scanners into types package git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270720 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/java/org/apache/antlib/xml/XMLValidateTask.java | 2 +- .../myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/file/Copy.java | 4 ++-- .../src/main/org/apache/tools/ant/taskdefs/file/Delete.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/file/Touch.java | 2 +- .../main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java | 4 ++-- .../org/apache/tools/ant/taskdefs/optional/IContract.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/Native2Ascii.java | 4 ++-- .../org/apache/tools/ant/taskdefs/optional/NetRexxC.java | 2 +- .../apache/tools/ant/taskdefs/optional/depend/Depend.java | 2 +- .../apache/tools/ant/taskdefs/optional/dotnet/CSharp.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java | 2 +- .../apache/tools/ant/taskdefs/optional/i18n/Translate.java | 2 +- .../apache/tools/ant/taskdefs/optional/ide/VAJExport.java | 4 ++-- .../apache/tools/ant/taskdefs/optional/ide/VAJImport.java | 2 +- .../apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/jsp/JspC.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java | 2 +- .../ant/taskdefs/optional/junit/XMLResultAggregator.java | 2 +- .../ant/taskdefs/optional/metamata/AbstractMetamataTask.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/net/MimeMail.java | 2 +- .../apache/tools/ant/taskdefs/optional/perforce/P4Add.java | 2 +- .../tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java | 2 +- .../apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/text/Replace.java | 2 +- .../org/apache/tools/ant/{ => types}/DirectoryScanner.java | 2 +- .../ant => main/org/apache/tools/ant/types}/FileScanner.java | 2 +- .../src/main/org/apache/tools/ant/types/FileSet.java | 2 -- .../apache/tools/ant/{util => types}/SourceFileScanner.java | 5 +++-- .../src/main/org/apache/tools/ant/types/ZipFileSet.java | 1 - .../src/main/org/apache/tools/ant/types/ZipScanner.java | 1 - .../src/todo/org/apache/tools/ant/taskdefs/file/Copy.java | 4 ++-- .../src/todo/org/apache/tools/ant/taskdefs/file/Delete.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/file/Touch.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java | 4 ++-- .../org/apache/tools/ant/taskdefs/optional/IContract.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/Native2Ascii.java | 4 ++-- .../org/apache/tools/ant/taskdefs/optional/NetRexxC.java | 2 +- .../apache/tools/ant/taskdefs/optional/depend/Depend.java | 2 +- .../apache/tools/ant/taskdefs/optional/dotnet/CSharp.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java | 2 +- .../apache/tools/ant/taskdefs/optional/i18n/Translate.java | 2 +- .../apache/tools/ant/taskdefs/optional/ide/VAJExport.java | 4 ++-- .../apache/tools/ant/taskdefs/optional/ide/VAJImport.java | 2 +- .../apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java | 2 +- .../tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/jsp/JspC.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java | 2 +- .../ant/taskdefs/optional/junit/XMLResultAggregator.java | 2 +- .../ant/taskdefs/optional/metamata/AbstractMetamataTask.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/net/MimeMail.java | 2 +- .../apache/tools/ant/taskdefs/optional/perforce/P4Add.java | 2 +- .../tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java | 2 +- .../apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/text/Replace.java | 2 +- .../org/apache/tools/ant/{ => types}/DirectoryScanner.java | 2 +- .../ant => todo/org/apache/tools/ant/types}/FileScanner.java | 2 +- .../src/todo/org/apache/tools/ant/types/FileSet.java | 2 -- .../apache/tools/ant/{util => types}/SourceFileScanner.java | 5 +++-- .../src/todo/org/apache/tools/ant/types/ZipFileSet.java | 1 - .../src/todo/org/apache/tools/ant/types/ZipScanner.java | 1 - 64 files changed, 70 insertions(+), 76 deletions(-) rename proposal/myrmidon/src/main/org/apache/tools/ant/{ => types}/DirectoryScanner.java (99%) rename proposal/myrmidon/src/{todo/org/apache/tools/ant => main/org/apache/tools/ant/types}/FileScanner.java (99%) rename proposal/myrmidon/src/main/org/apache/tools/ant/{util => types}/SourceFileScanner.java (98%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/{ => types}/DirectoryScanner.java (99%) rename proposal/myrmidon/src/{main/org/apache/tools/ant => todo/org/apache/tools/ant/types}/FileScanner.java (99%) rename proposal/myrmidon/src/todo/org/apache/tools/ant/{util => types}/SourceFileScanner.java (98%) 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 a14bb685e..309689d76 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; diff --git a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java index 1f9739ab8..09cad6b39 100644 --- a/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java +++ b/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java @@ -12,7 +12,7 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java index 59974f2e5..3f78d2af2 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java @@ -15,7 +15,7 @@ import java.util.Hashtable; import java.util.Iterator; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterSet; @@ -25,7 +25,7 @@ import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.FlatFileNameMapper; import org.apache.tools.ant.util.IdentityMapper; -import org.apache.tools.ant.util.SourceFileScanner; +import org.apache.tools.ant.types.SourceFileScanner; /** * A consolidated copy task. Copies a file or directory to a new file or diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java index 3b3873100..cbaac5723 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.file; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Touch.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Touch.java index c89c24a93..61298d3f4 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Touch.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Touch.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Locale; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index 05d133534..76fbc1f24 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -18,7 +18,7 @@ import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.Os; import org.apache.aut.nativelib.ExecOutputHandler; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; @@ -546,7 +546,7 @@ public class Javadoc m_command.createArgument().setValue( m_bottom.getText() ); } - Commandline cmd = (Commandline)m_command.clone(); + Commandline cmd = new Commandline();//(Commandline)m_command.clone(); cmd.setExecutable( getJavadocExecutableName() ); // ------------------------------------------------ general javadoc arguments diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java index face35530..e2849540c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -16,7 +16,7 @@ import java.util.Date; import java.util.Properties; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.listeners.AbstractProjectListener; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.MatchingTask; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java index 9abdee1f1..b972900d3 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -9,13 +9,13 @@ package org.apache.tools.ant.taskdefs.optional; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.IdentityMapper; -import org.apache.tools.ant.util.SourceFileScanner; +import org.apache.tools.ant.types.SourceFileScanner; /** * Convert files from native encodings to ascii. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index c6572f6a4..1b8bc9577 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -20,7 +20,7 @@ import netrexx.lang.Rexx; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index b7a483cdb..42c794d60 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -21,7 +21,7 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index da2ab776b..53db588c5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -9,7 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; // ==================================================================== diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 36bb1f30c..f403610a9 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -9,7 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Task to assemble .net 'Intermediate Language' files. The task will only work diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index e484ce1a4..dc8bbf4c6 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -20,7 +20,7 @@ import java.util.Hashtable; import java.util.Locale; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java index 046c4ff13..a9e6d9bec 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java @@ -174,8 +174,8 @@ public class VAJExport extends VAJTask // delegate the export to the VAJUtil object. getUtil().exportPackages( destDir, - patternSet.getIncludePatterns( getProject() ), - patternSet.getExcludePatterns( getProject() ), + patternSet.getIncludePatterns( null ), + patternSet.getExcludePatterns( null ), exportClasses, exportDebugInfo, exportResources, exportSources, useDefaultExcludes, overwrite ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index f2136e32a..28d7bb4dc 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -11,7 +11,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index d36c9cd54..02d25adb1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -20,7 +20,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Helper class for VAJ tasks. Holds Workspace singleton and wraps IvjExceptions diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java index 8d6ea0070..d87c61245 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java @@ -14,7 +14,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Class for scanning a Visual Age for Java workspace for packages matching a diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index da1b9462c..5b51a0a5d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -11,7 +11,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 12e9f51b6..417f8223e 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 17924729c..266cbb5e5 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -19,7 +19,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.DOMElementWriter; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 9d74e018f..dc340cde8 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -17,7 +17,7 @@ import java.util.Iterator; import java.util.Random; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.CommandlineJava; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java index d98fe62c9..71775e916 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java @@ -24,7 +24,7 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java index 100e52d9e..af235b609 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index e60c97b16..463bfb851 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java @@ -17,7 +17,7 @@ import com.starbase.starteam.View; import com.starbase.util.Platform; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Checks out files from a specific StarTeam server, project, view, and folder. diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index 96cf01185..8582c2454 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -14,7 +14,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Random; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java index e78f8a702..42364ddaa 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java @@ -24,7 +24,7 @@ import java.io.Writer; import java.util.Iterator; import java.util.NoSuchElementException; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java index 369edc654..1c2af2a0f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Properties; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/DirectoryScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java similarity index 99% rename from proposal/myrmidon/src/main/org/apache/tools/ant/DirectoryScanner.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java index 3a52b4796..a8854b840 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/DirectoryScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant; +package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/FileScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java similarity index 99% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/FileScanner.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java index 473a1738b..205f6ec39 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/FileScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant; +package org.apache.tools.ant.types; import java.io.File; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java index a2714bc84..1c5d1cc73 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java @@ -10,8 +10,6 @@ package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.FileScanner; import org.apache.tools.ant.ProjectComponent; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java similarity index 98% rename from proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java rename to proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java index faf63d156..58c8b0ab1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java @@ -5,15 +5,16 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; +import org.apache.aut.nativelib.Os; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.aut.nativelib.Os; import org.apache.tools.ant.Task; +import org.apache.tools.ant.util.FileNameMapper; /** * Utility class that collects the functionality of the various scanDir methods diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java index a02497ade..fffd38f91 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.types; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java index d7e9a1a50..c6e734ab0 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.types; import java.io.File; -import org.apache.tools.ant.DirectoryScanner; /** * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, which diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java index 59974f2e5..3f78d2af2 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java @@ -15,7 +15,7 @@ import java.util.Hashtable; import java.util.Iterator; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.FilterSet; @@ -25,7 +25,7 @@ import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.FlatFileNameMapper; import org.apache.tools.ant.util.IdentityMapper; -import org.apache.tools.ant.util.SourceFileScanner; +import org.apache.tools.ant.types.SourceFileScanner; /** * A consolidated copy task. Copies a file or directory to a new file or diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java index 3b3873100..cbaac5723 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.file; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Touch.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Touch.java index c89c24a93..61298d3f4 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Touch.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Touch.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Locale; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index 05d133534..76fbc1f24 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -18,7 +18,7 @@ import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; import org.apache.aut.nativelib.Os; import org.apache.aut.nativelib.ExecOutputHandler; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; @@ -546,7 +546,7 @@ public class Javadoc m_command.createArgument().setValue( m_bottom.getText() ); } - Commandline cmd = (Commandline)m_command.clone(); + Commandline cmd = new Commandline();//(Commandline)m_command.clone(); cmd.setExecutable( getJavadocExecutableName() ); // ------------------------------------------------ general javadoc arguments diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java index face35530..e2849540c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java @@ -16,7 +16,7 @@ import java.util.Date; import java.util.Properties; import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.listeners.AbstractProjectListener; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.Javac; import org.apache.tools.ant.taskdefs.MatchingTask; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java index 9abdee1f1..b972900d3 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java @@ -9,13 +9,13 @@ package org.apache.tools.ant.taskdefs.optional; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Mapper; import org.apache.tools.ant.util.FileNameMapper; import org.apache.tools.ant.util.IdentityMapper; -import org.apache.tools.ant.util.SourceFileScanner; +import org.apache.tools.ant.types.SourceFileScanner; /** * Convert files from native encodings to ascii. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java index c6572f6a4..1b8bc9577 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java @@ -20,7 +20,7 @@ import netrexx.lang.Rexx; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java index b7a483cdb..42c794d60 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java @@ -21,7 +21,7 @@ import java.util.Enumeration; import java.util.Hashtable; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java index da2ab776b..53db588c5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java @@ -9,7 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.Path; // ==================================================================== diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java index 36bb1f30c..f403610a9 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java @@ -9,7 +9,7 @@ package org.apache.tools.ant.taskdefs.optional.dotnet; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Task to assemble .net 'Intermediate Language' files. The task will only work diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index e484ce1a4..dc8bbf4c6 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -20,7 +20,7 @@ import java.util.Hashtable; import java.util.Locale; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java index 046c4ff13..a9e6d9bec 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java @@ -174,8 +174,8 @@ public class VAJExport extends VAJTask // delegate the export to the VAJUtil object. getUtil().exportPackages( destDir, - patternSet.getIncludePatterns( getProject() ), - patternSet.getExcludePatterns( getProject() ), + patternSet.getIncludePatterns( null ), + patternSet.getExcludePatterns( null ), exportClasses, exportDebugInfo, exportResources, exportSources, useDefaultExcludes, overwrite ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java index f2136e32a..28d7bb4dc 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java @@ -11,7 +11,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java index d36c9cd54..02d25adb1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java @@ -20,7 +20,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Helper class for VAJ tasks. Holds Workspace singleton and wraps IvjExceptions diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java index 8d6ea0070..d87c61245 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java @@ -14,7 +14,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.StringTokenizer; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Class for scanning a Visual Age for Java workspace for packages matching a diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java index da1b9462c..5b51a0a5d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java @@ -11,7 +11,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Date; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java index 12e9f51b6..417f8223e 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.Java; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.Path; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java index 17924729c..266cbb5e5 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java @@ -19,7 +19,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.apache.avalon.framework.ExceptionUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.DOMElementWriter; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java index 9d74e018f..dc340cde8 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java @@ -17,7 +17,7 @@ import java.util.Iterator; import java.util.Random; import org.apache.myrmidon.api.AbstractTask; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Argument; import org.apache.tools.ant.types.CommandlineJava; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java index d98fe62c9..71775e916 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java @@ -24,7 +24,7 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java index 100e52d9e..af235b609 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java @@ -10,7 +10,7 @@ package org.apache.tools.ant.taskdefs.optional.perforce; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.types.FileSet; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java index e60c97b16..463bfb851 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java @@ -17,7 +17,7 @@ import com.starbase.starteam.View; import com.starbase.util.Platform; import java.util.StringTokenizer; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; /** * Checks out files from a specific StarTeam server, project, view, and folder. diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java index 96cf01185..8582c2454 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java @@ -14,7 +14,7 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.Random; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.exec.Execute2; import org.apache.tools.ant.types.Commandline; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java index e78f8a702..42364ddaa 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java @@ -24,7 +24,7 @@ import java.io.Writer; import java.util.Iterator; import java.util.NoSuchElementException; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; import org.apache.tools.ant.types.EnumeratedAttribute; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java index 369edc654..1c2af2a0f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.Properties; import org.apache.avalon.excalibur.util.StringUtil; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.taskdefs.MatchingTask; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/DirectoryScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java similarity index 99% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/DirectoryScanner.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java index 3a52b4796..a8854b840 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/DirectoryScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant; +package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/FileScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java similarity index 99% rename from proposal/myrmidon/src/main/org/apache/tools/ant/FileScanner.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java index 473a1738b..205f6ec39 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/FileScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant; +package org.apache.tools.ant.types; import java.io.File; import org.apache.myrmidon.api.TaskException; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java index a2714bc84..1c5d1cc73 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java @@ -10,8 +10,6 @@ package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; -import org.apache.tools.ant.FileScanner; import org.apache.tools.ant.ProjectComponent; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java similarity index 98% rename from proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java rename to proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java index faf63d156..58c8b0ab1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java @@ -5,15 +5,16 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.tools.ant.util; +package org.apache.tools.ant.types; import java.io.File; import java.util.ArrayList; +import org.apache.aut.nativelib.Os; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.myrmidon.api.TaskException; -import org.apache.aut.nativelib.Os; import org.apache.tools.ant.Task; +import org.apache.tools.ant.util.FileNameMapper; /** * Utility class that collects the functionality of the various scanDir methods diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java index a02497ade..fffd38f91 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java @@ -9,7 +9,6 @@ package org.apache.tools.ant.types; import java.io.File; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java index d7e9a1a50..c6e734ab0 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java @@ -8,7 +8,6 @@ package org.apache.tools.ant.types; import java.io.File; -import org.apache.tools.ant.DirectoryScanner; /** * ZipScanner accesses the pattern matching algorithm in DirectoryScanner, which