youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
Browse Source

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
master
Peter Donald 23 years ago
parent
aff894bd1a
commit
f8ab615aea
64 changed files with 70 additions and 76 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
  2. +1
    -1
      proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java
  3. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
  4. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
  5. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Touch.java
  6. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  7. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  8. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  9. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
  10. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
  11. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
  12. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
  13. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  14. +2
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java
  15. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
  16. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
  17. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
  18. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
  19. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  20. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
  21. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
  22. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
  23. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
  24. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  25. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  26. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java
  27. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java
  28. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java
  29. +1
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java
  30. +0
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java
  31. +3
    -2
      proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java
  32. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java
  33. +0
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java
  34. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
  35. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
  36. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Touch.java
  37. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  38. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
  39. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  40. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
  41. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
  42. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
  43. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
  44. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  45. +2
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java
  46. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
  47. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java
  48. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java
  49. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
  50. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  51. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
  52. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
  53. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
  54. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
  55. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  56. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  57. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java
  58. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java
  59. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java
  60. +1
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java
  61. +0
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java
  62. +3
    -2
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java
  63. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java
  64. +0
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java

+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java View File

@@ -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;


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Touch.java View File

@@ -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;

/**


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java View File

@@ -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;


+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java View File

@@ -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.


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java View File

@@ -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;

/**


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java View File

@@ -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;

// ====================================================================


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java View File

@@ -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;



+ 2
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java View File

@@ -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 );


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java View File

@@ -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;

/**


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java View File

@@ -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;

/**


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java View File

@@ -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.


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java View File

@@ -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;

/**


proposal/myrmidon/src/main/org/apache/tools/ant/DirectoryScanner.java → proposal/myrmidon/src/main/org/apache/tools/ant/types/DirectoryScanner.java View File

@@ -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;

proposal/myrmidon/src/todo/org/apache/tools/ant/FileScanner.java → proposal/myrmidon/src/main/org/apache/tools/ant/types/FileScanner.java View File

@@ -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;

+ 0
- 2
proposal/myrmidon/src/main/org/apache/tools/ant/types/FileSet.java View File

@@ -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;

/**


proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java → proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java View File

@@ -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

+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java View File

@@ -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;

/**


+ 0
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipScanner.java View File

@@ -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


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Touch.java View File

@@ -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;

/**


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java View File

@@ -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;


+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java View File

@@ -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.


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/NetRexxC.java View File

@@ -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;

/**


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java View File

@@ -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;

// ====================================================================


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java View File

@@ -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;



+ 2
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java View File

@@ -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 );


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java View File

@@ -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;

/**


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java View File

@@ -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


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java View File

@@ -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;

/**


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java View File

@@ -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.


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java View File

@@ -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;


+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/FixCRLF.java View File

@@ -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;



+ 1
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/text/Replace.java View File

@@ -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;

/**


proposal/myrmidon/src/todo/org/apache/tools/ant/DirectoryScanner.java → proposal/myrmidon/src/todo/org/apache/tools/ant/types/DirectoryScanner.java View File

@@ -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;

proposal/myrmidon/src/main/org/apache/tools/ant/FileScanner.java → proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileScanner.java View File

@@ -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;

+ 0
- 2
proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileSet.java View File

@@ -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;

/**


proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java → proposal/myrmidon/src/todo/org/apache/tools/ant/types/SourceFileScanner.java View File

@@ -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

+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java View File

@@ -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;

/**


+ 0
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipScanner.java View File

@@ -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


Write Preview
Loading…
Cancel
Save
Please read the following content carefully:

Dear OpenI User

Thank you for your continuous support to the Openl Qizhi Community AI Collaboration Platform. In order to protect your usage rights and ensure network security, we updated the Openl Qizhi Community AI Collaboration Platform Usage Agreement in January 2024. The updated agreement specifies that users are prohibited from using intranet penetration tools. After you click "Agree and continue", you can continue to use our services. Thank you for your cooperation and understanding.

For more agreement content, please refer to the《Openl Qizhi Community AI Collaboration Platform Usage Agreement》

Agree and continue
Disagree, exit