git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270865 13f79535-47bb-0310-9956-ffa450edef68remotes/1754080253418571416/tmp_add1b33bc52a72089682e3b7f90487e73c10ad84
@@ -19,6 +19,7 @@ import org.apache.tools.ant.taskdefs.exec.Execute2; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Sign a archive. | |||
@@ -152,7 +153,7 @@ public class SignJar | |||
for( int i = 0; i < m_filesets.size(); i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
final String[] jarFiles = scanner.getIncludedFiles(); | |||
for( int j = 0; j < jarFiles.length; j++ ) | |||
{ | |||
@@ -25,6 +25,7 @@ import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.PathUtil; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.xml.sax.EntityResolver; | |||
import org.xml.sax.InputSource; | |||
@@ -223,7 +224,7 @@ public class XMLValidateTask | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
final String[] files = scanner.getIncludedFiles(); | |||
for( int j = 0; j < files.length; j++ ) | |||
@@ -26,6 +26,7 @@ import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.taskdefs.condition.Condition; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* This task can be used to create checksums for files. It can also be used to | |||
@@ -502,7 +503,7 @@ public class Checksum | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
final String[] srcFiles = scanner.getIncludedFiles(); | |||
for( int j = 0; j < srcFiles.length; j++ ) | |||
{ | |||
@@ -16,6 +16,7 @@ import org.apache.aut.nativelib.Os; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileList; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* A Task to record explicit dependencies. If any of the target files are out of | |||
@@ -154,7 +155,7 @@ public class DependSet extends MatchingTask | |||
{ | |||
FileSet targetFS = (FileSet)enumTargetSets.next(); | |||
DirectoryScanner targetDS = targetFS.getDirectoryScanner(); | |||
DirectoryScanner targetDS = ScannerUtil.getDirectoryScanner( targetFS ); | |||
String[] targetFiles = targetDS.getIncludedFiles(); | |||
for( int i = 0; i < targetFiles.length; i++ ) | |||
@@ -212,7 +213,7 @@ public class DependSet extends MatchingTask | |||
{ | |||
FileSet sourceFS = (FileSet)enumSourceSets.next(); | |||
DirectoryScanner sourceDS = sourceFS.getDirectoryScanner(); | |||
DirectoryScanner sourceDS = ScannerUtil.getDirectoryScanner( sourceFS ); | |||
String[] sourceFiles = sourceDS.getIncludedFiles(); | |||
for( int i = 0; upToDate && i < sourceFiles.length; i++ ) | |||
@@ -19,9 +19,11 @@ import java.util.zip.ZipEntry; | |||
import java.util.zip.ZipInputStream; | |||
import org.apache.avalon.excalibur.io.FileUtil; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.api.TaskContext; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
import org.apache.myrmidon.framework.PatternUtil; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
@@ -132,7 +134,7 @@ public class Expand extends MatchingTask | |||
for( int j = 0; j < filesets.size(); j++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( j ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
File fromDir = fs.getDir(); | |||
String[] files = ds.getIncludedFiles(); | |||
@@ -201,7 +203,8 @@ public class Expand extends MatchingTask | |||
for( int v = 0; v < patternsets.size(); v++ ) | |||
{ | |||
PatternSet p = (PatternSet)patternsets.get( v ); | |||
String[] incls = p.getIncludePatterns( getContext() ); | |||
final TaskContext context = getContext(); | |||
String[] incls = PatternUtil.getIncludePatterns( p, context ); | |||
if( incls != null ) | |||
{ | |||
for( int w = 0; w < incls.length; w++ ) | |||
@@ -214,7 +217,8 @@ public class Expand extends MatchingTask | |||
} | |||
} | |||
} | |||
String[] excls = p.getExcludePatterns( getContext() ); | |||
final TaskContext context1 = getContext(); | |||
String[] excls = PatternUtil.getExcludePatterns( p, context1 ); | |||
if( excls != null ) | |||
{ | |||
for( int w = 0; w < excls.length; w++ ) | |||
@@ -13,6 +13,7 @@ import org.apache.myrmidon.framework.Pattern; | |||
import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
/** | |||
@@ -83,13 +84,10 @@ public abstract class MatchingTask | |||
/** | |||
* add a set of patterns | |||
* | |||
* @return Description of the Returned Value | |||
*/ | |||
public PatternSet createPatternSet() | |||
throws TaskException | |||
public void addPatternSet( final PatternSet set ) | |||
{ | |||
return m_fileset.createPatternSet(); | |||
m_fileset.addPatternSet( set ); | |||
} | |||
/** | |||
@@ -103,6 +101,6 @@ public abstract class MatchingTask | |||
{ | |||
m_fileset.setDir( baseDir ); | |||
m_fileset.setDefaultexcludes( m_useDefaultExcludes ); | |||
return m_fileset.getDirectoryScanner(); | |||
return ScannerUtil.getDirectoryScanner( m_fileset ); | |||
} | |||
} |
@@ -39,6 +39,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.PathUtil; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Reads in a text file containing SQL statements seperated with semicolons and | |||
@@ -382,7 +383,7 @@ public class SQLExec | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
File srcDir = fs.getDir(); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
@@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.myrmidon.api.TaskException; | |||
public class TarFileSet | |||
@@ -46,7 +47,7 @@ public class TarFileSet | |||
{ | |||
if( m_files == null ) | |||
{ | |||
final DirectoryScanner scanner = getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( this ); | |||
final String[] directories = scanner.getIncludedDirectories(); | |||
final String[] filesPerSe = scanner.getIncludedFiles(); | |||
m_files = new String[ directories.length + filesPerSe.length ]; | |||
@@ -18,6 +18,7 @@ import org.apache.tools.ant.util.mappers.Mapper; | |||
import org.apache.tools.ant.util.mappers.FileNameMapper; | |||
import org.apache.tools.ant.util.mappers.MergingMapper; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Will set the given property if the specified target has a timestamp greater | |||
@@ -128,7 +129,7 @@ public class UpToDate extends MatchingTask implements Condition | |||
while( upToDate && enum.hasNext() ) | |||
{ | |||
FileSet fs = (FileSet)enum.next(); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
upToDate = upToDate && scanDir( fs.getDir(), | |||
ds.getIncludedFiles() ); | |||
} | |||
@@ -27,6 +27,7 @@ import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ZipFileSet; | |||
import org.apache.tools.ant.types.ZipScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.util.mappers.MergingMapper; | |||
import org.apache.aut.zip.ZipEntry; | |||
import org.apache.aut.zip.ZipOutputStream; | |||
@@ -266,7 +267,7 @@ public class Zip | |||
for( int i = 0; i < m_filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)m_filesets.get( i ); | |||
dss.add( fs.getDirectoryScanner() ); | |||
dss.add( ScannerUtil.getDirectoryScanner( fs ) ); | |||
} | |||
int dssSize = dss.size(); | |||
FileScanner[] scanners = new FileScanner[ dssSize ]; | |||
@@ -556,7 +557,7 @@ public class Zip | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String prefix = ""; | |||
String fullpath = ""; | |||
@@ -17,6 +17,7 @@ import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Marker; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.util.mappers.FileNameMapper; | |||
import org.apache.tools.ant.util.mappers.Mapper; | |||
@@ -369,7 +370,7 @@ public class ExecuteOn | |||
{ | |||
final FileSet fs = (FileSet)m_filesets.get( i ); | |||
final File base = fs.getDir(); | |||
final DirectoryScanner ds = fs.getDirectoryScanner(); | |||
final DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
if( !"dir".equals( m_type ) ) | |||
{ | |||
@@ -26,6 +26,7 @@ import org.apache.tools.ant.util.FileUtils; | |||
import org.apache.tools.ant.util.mappers.FlatFileNameMapper; | |||
import org.apache.tools.ant.util.mappers.IdentityMapper; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* A consolidated copy task. Copies a file or directory to a new file or | |||
@@ -229,7 +230,7 @@ public class Copy | |||
for( int i = 0; i < m_filesets.size(); i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
final File fromDir = fileSet.getDir(); | |||
final String[] srcFiles = scanner.getIncludedFiles(); | |||
@@ -487,7 +488,7 @@ public class Copy | |||
else | |||
{ | |||
FileSet fs = (FileSet)m_filesets.get( 0 ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
if( srcFiles.length > 0 ) | |||
@@ -13,6 +13,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
/** | |||
* Deletes a file or directory, or set of files defined by a fileset. The | |||
@@ -126,7 +127,7 @@ public class Delete | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
try | |||
{ | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] files = ds.getIncludedFiles(); | |||
String[] dirs = ds.getIncludedDirectories(); | |||
removeFiles( fs.getDir(), files, dirs ); | |||
@@ -18,6 +18,7 @@ import org.apache.myrmidon.api.AbstractTask; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Touch a file and/or fileset(s) -- corresponds to the Unix touch command. <p> | |||
@@ -157,7 +158,7 @@ public class Touch | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
final FileSet fs = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner ds = fs.getDirectoryScanner(); | |||
final DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
final File fromDir = fs.getDir(); | |||
final String[] srcFiles = ds.getIncludedFiles(); | |||
@@ -26,6 +26,7 @@ import org.apache.tools.ant.taskdefs.exec.Execute2; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* This task makes it easy to generate Javadoc documentation for a collection of | |||
@@ -984,7 +985,7 @@ public class Javadoc | |||
final File source = resolveFile( list[ j ] ); | |||
fs.setDir( source ); | |||
final DirectoryScanner ds = fs.getDirectoryScanner(); | |||
final DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
final String[] packageDirs = ds.getIncludedDirectories(); | |||
for( int i = 0; i < packageDirs.length; i++ ) | |||
@@ -21,6 +21,7 @@ import org.apache.tools.ant.taskdefs.MatchingTask; | |||
import org.apache.tools.ant.taskdefs.exec.Execute2; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Create a CAB archive. | |||
@@ -174,7 +175,7 @@ public class Cab | |||
FileSet fs = (FileSet)m_filesets.get( i ); | |||
if( fs != null ) | |||
{ | |||
appendFiles( files, fs.getDirectoryScanner() ); | |||
appendFiles( files, ScannerUtil.getDirectoryScanner( fs ) ); | |||
} | |||
} | |||
} | |||
@@ -36,6 +36,7 @@ import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.PathUtil; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.util.depend.Dependencies; | |||
import org.apache.tools.ant.util.depend.Filter; | |||
import org.xml.sax.InputSource; | |||
@@ -567,7 +568,7 @@ public class GenericDeploymentTool | |||
{ | |||
FileSet supportFileSet = (FileSet)i.next(); | |||
File supportBaseDir = supportFileSet.getDir(); | |||
DirectoryScanner supportScanner = supportFileSet.getDirectoryScanner(); | |||
DirectoryScanner supportScanner = ScannerUtil.getDirectoryScanner( supportFileSet ); | |||
supportScanner.scan(); | |||
String[] supportFiles = supportScanner.getIncludedFiles(); | |||
for( int j = 0; j < supportFiles.length; ++j ) | |||
@@ -23,6 +23,7 @@ import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.taskdefs.MatchingTask; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Translates text embedded in files using Resource Bundle files. | |||
@@ -518,7 +519,7 @@ public class Translate | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
for( int j = 0; j < srcFiles.length; j++ ) | |||
{ | |||
@@ -9,8 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ide; | |||
import java.io.File; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.api.TaskContext; | |||
import org.apache.myrmidon.framework.Pattern; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
import org.apache.myrmidon.framework.PatternUtil; | |||
/** | |||
* Export packages from the Visual Age for Java workspace. The packages are | |||
@@ -172,9 +174,11 @@ public class VAJExport extends VAJTask | |||
} | |||
// delegate the export to the VAJUtil object. | |||
final TaskContext context = getContext(); | |||
final TaskContext context1 = getContext(); | |||
getUtil().exportPackages( destDir, | |||
patternSet.getIncludePatterns( getContext() ), | |||
patternSet.getExcludePatterns( getContext() ), | |||
PatternUtil.getIncludePatterns( patternSet, context ), | |||
PatternUtil.getExcludePatterns( patternSet, context1 ), | |||
exportClasses, exportDebugInfo, | |||
exportResources, exportSources, | |||
useDefaultExcludes, overwrite ); | |||
@@ -13,6 +13,7 @@ import java.util.Iterator; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Import source, class files, and resources to the Visual Age for Java | |||
@@ -224,7 +225,7 @@ public class VAJImport extends VAJTask | |||
*/ | |||
protected void importFileset( FileSet fileset ) | |||
{ | |||
DirectoryScanner ds = fileset.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fileset ); | |||
if( ds.getIncludedFiles().length == 0 ) | |||
{ | |||
return; | |||
@@ -15,6 +15,7 @@ import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* <p> | |||
@@ -116,7 +117,7 @@ public final class BatchTest extends BaseTest | |||
for( int j = 0; j < size; j++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( j ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
ds.scan(); | |||
String[] f = ds.getIncludedFiles(); | |||
for( int k = 0; k < f.length; k++ ) | |||
@@ -22,6 +22,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
import org.w3c.dom.Document; | |||
import org.w3c.dom.Element; | |||
import org.xml.sax.SAXException; | |||
@@ -201,7 +202,7 @@ public class XMLResultAggregator | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
scanner.scan(); | |||
final String[] includes = scanner.getIncludedFiles(); | |||
for( int j = 0; j < includes.length; j++ ) | |||
@@ -23,6 +23,7 @@ import org.apache.tools.ant.types.Argument; | |||
import org.apache.tools.ant.types.CommandlineJava; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Somewhat abstract framework to be used for other metama 2.0 tasks. This | |||
@@ -338,7 +339,7 @@ public abstract class AbstractMetamataTask | |||
for( int i = 0; i < m_fileSets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)m_fileSets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
ds.scan(); | |||
String[] f = ds.getIncludedFiles(); | |||
getLogger().debug( i + ") Adding " + f.length + " files from directory " + ds.getBasedir() ); | |||
@@ -23,9 +23,12 @@ import java.io.OutputStream; | |||
import java.util.ArrayList; | |||
import org.apache.avalon.excalibur.io.FileUtil; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.api.TaskContext; | |||
import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.types.FileScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
/** | |||
* Basic FTP client that performs the following actions: | |||
@@ -772,12 +775,14 @@ public class FTP | |||
if( m_action == SEND_FILES ) | |||
{ | |||
ds = fs.getDirectoryScanner(); | |||
ds = ScannerUtil.getDirectoryScanner( fs ); | |||
} | |||
else | |||
{ | |||
ds = new FTPDirectoryScanner( ftp ); | |||
fs.setupDirectoryScanner( ds ); | |||
final FileScanner ds1 = ds; | |||
final TaskContext context = getContext(); | |||
ScannerUtil.setupDirectoryScanner( fs, ds1, context ); | |||
ds.scan(); | |||
} | |||
@@ -27,6 +27,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
/** | |||
* A task to send SMTP email. This version has near identical syntax to the | |||
@@ -309,7 +310,7 @@ public class MimeMail extends Task | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
if( fs != null ) | |||
{ | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] dsfiles = ds.getIncludedFiles(); | |||
File baseDir = ds.getBasedir(); | |||
@@ -12,6 +12,7 @@ import java.util.ArrayList; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* P4Add - add the specified files to perforce. <b>Example Usage:</b> | |||
@@ -125,7 +126,7 @@ public class P4Add extends P4Base | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
//File fromDir = fs.getDir(project); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
@@ -19,6 +19,7 @@ import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.taskdefs.exec.Execute2; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Convenient task to run the snapshot merge utility for JProbe Coverage. | |||
@@ -150,7 +151,7 @@ public class CovMerge extends Task | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
ds.scan(); | |||
String[] f = ds.getIncludedFiles(); | |||
for( int j = 0; j < f.length; j++ ) | |||
@@ -20,6 +20,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
import org.apache.tools.ant.util.regexp.Regexp; | |||
/** | |||
@@ -216,7 +217,7 @@ public class ReplaceRegExp extends Task | |||
for( int i = 0; i < sz; i++ ) | |||
{ | |||
FileSet fs = (FileSet)( filesets.get( i ) ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String files[] = ds.getIncludedFiles(); | |||
for( int j = 0; j < files.length; j++ ) | |||
@@ -12,11 +12,11 @@ import java.io.IOException; | |||
import org.apache.aut.nativelib.Os; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.framework.Pattern; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
import org.apache.tools.ant.taskdefs.exec.Execute; | |||
import org.apache.tools.ant.taskdefs.exec.ExecuteOn; | |||
import org.apache.tools.ant.types.Argument; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
/** | |||
* Chmod equivalent for unix-like environments. | |||
@@ -64,11 +64,8 @@ public class Chmod | |||
/** | |||
* Sets the set of exclude patterns. Patterns may be separated by a comma or | |||
* a space. | |||
* | |||
* @param excludes the string containing the exclude patterns | |||
*/ | |||
public void setExcludes( String excludes ) | |||
throws TaskException | |||
{ | |||
m_defaultSetDefined = true; | |||
m_defaultSet.setExcludes( excludes ); | |||
@@ -96,7 +93,6 @@ public class Chmod | |||
* @param includes the string containing the include patterns | |||
*/ | |||
public void setIncludes( String includes ) | |||
throws TaskException | |||
{ | |||
m_defaultSetDefined = true; | |||
m_defaultSet.setIncludes( includes ); | |||
@@ -127,7 +123,6 @@ public class Chmod | |||
* add a name entry on the include list | |||
*/ | |||
public void addInclude( final Pattern pattern ) | |||
throws TaskException | |||
{ | |||
m_defaultSetDefined = true; | |||
m_defaultSet.addInclude( pattern ); | |||
@@ -135,13 +130,11 @@ public class Chmod | |||
/** | |||
* add a set of patterns | |||
* | |||
*/ | |||
public PatternSet createPatternSet() | |||
throws TaskException | |||
public void addPatternSet( final PatternSet set ) | |||
{ | |||
m_defaultSetDefined = true; | |||
return m_defaultSet.createPatternSet(); | |||
m_defaultSet.addPatternSet( set ); | |||
} | |||
public void execute() | |||
@@ -154,8 +147,10 @@ public class Chmod | |||
else if( isValidOs() ) | |||
{ | |||
// we are chmodding the given directory | |||
addArg( new Argument( m_defaultSet.getDir().getPath() ) ); | |||
Execute execute = prepareExec(); | |||
final Argument argument = | |||
new Argument( m_defaultSet.getDir().getPath() ); | |||
addArg( argument ); | |||
final Execute execute = prepareExec(); | |||
try | |||
{ | |||
execute.setCommandline( getCommand().getCommandline() ); | |||
@@ -26,6 +26,7 @@ import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.taskdefs.condition.Condition; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* This task can be used to create checksums for files. It can also be used to | |||
@@ -502,7 +503,7 @@ public class Checksum | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
final String[] srcFiles = scanner.getIncludedFiles(); | |||
for( int j = 0; j < srcFiles.length; j++ ) | |||
{ | |||
@@ -16,6 +16,7 @@ import org.apache.aut.nativelib.Os; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileList; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* A Task to record explicit dependencies. If any of the target files are out of | |||
@@ -154,7 +155,7 @@ public class DependSet extends MatchingTask | |||
{ | |||
FileSet targetFS = (FileSet)enumTargetSets.next(); | |||
DirectoryScanner targetDS = targetFS.getDirectoryScanner(); | |||
DirectoryScanner targetDS = ScannerUtil.getDirectoryScanner( targetFS ); | |||
String[] targetFiles = targetDS.getIncludedFiles(); | |||
for( int i = 0; i < targetFiles.length; i++ ) | |||
@@ -212,7 +213,7 @@ public class DependSet extends MatchingTask | |||
{ | |||
FileSet sourceFS = (FileSet)enumSourceSets.next(); | |||
DirectoryScanner sourceDS = sourceFS.getDirectoryScanner(); | |||
DirectoryScanner sourceDS = ScannerUtil.getDirectoryScanner( sourceFS ); | |||
String[] sourceFiles = sourceDS.getIncludedFiles(); | |||
for( int i = 0; upToDate && i < sourceFiles.length; i++ ) | |||
@@ -19,9 +19,11 @@ import java.util.zip.ZipEntry; | |||
import java.util.zip.ZipInputStream; | |||
import org.apache.avalon.excalibur.io.FileUtil; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.api.TaskContext; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
import org.apache.myrmidon.framework.PatternUtil; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
@@ -132,7 +134,7 @@ public class Expand extends MatchingTask | |||
for( int j = 0; j < filesets.size(); j++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( j ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
File fromDir = fs.getDir(); | |||
String[] files = ds.getIncludedFiles(); | |||
@@ -201,7 +203,8 @@ public class Expand extends MatchingTask | |||
for( int v = 0; v < patternsets.size(); v++ ) | |||
{ | |||
PatternSet p = (PatternSet)patternsets.get( v ); | |||
String[] incls = p.getIncludePatterns( getContext() ); | |||
final TaskContext context = getContext(); | |||
String[] incls = PatternUtil.getIncludePatterns( p, context ); | |||
if( incls != null ) | |||
{ | |||
for( int w = 0; w < incls.length; w++ ) | |||
@@ -214,7 +217,8 @@ public class Expand extends MatchingTask | |||
} | |||
} | |||
} | |||
String[] excls = p.getExcludePatterns( getContext() ); | |||
final TaskContext context1 = getContext(); | |||
String[] excls = PatternUtil.getExcludePatterns( p, context1 ); | |||
if( excls != null ) | |||
{ | |||
for( int w = 0; w < excls.length; w++ ) | |||
@@ -13,6 +13,7 @@ import org.apache.myrmidon.framework.Pattern; | |||
import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
/** | |||
@@ -83,13 +84,10 @@ public abstract class MatchingTask | |||
/** | |||
* add a set of patterns | |||
* | |||
* @return Description of the Returned Value | |||
*/ | |||
public PatternSet createPatternSet() | |||
throws TaskException | |||
public void addPatternSet( final PatternSet set ) | |||
{ | |||
return m_fileset.createPatternSet(); | |||
m_fileset.addPatternSet( set ); | |||
} | |||
/** | |||
@@ -103,6 +101,6 @@ public abstract class MatchingTask | |||
{ | |||
m_fileset.setDir( baseDir ); | |||
m_fileset.setDefaultexcludes( m_useDefaultExcludes ); | |||
return m_fileset.getDirectoryScanner(); | |||
return ScannerUtil.getDirectoryScanner( m_fileset ); | |||
} | |||
} |
@@ -39,6 +39,7 @@ import org.apache.tools.ant.types.EnumeratedAttribute; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.PathUtil; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Reads in a text file containing SQL statements seperated with semicolons and | |||
@@ -382,7 +383,7 @@ public class SQLExec | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
File srcDir = fs.getDir(); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
@@ -9,6 +9,7 @@ package org.apache.tools.ant.taskdefs; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.myrmidon.api.TaskException; | |||
public class TarFileSet | |||
@@ -46,7 +47,7 @@ public class TarFileSet | |||
{ | |||
if( m_files == null ) | |||
{ | |||
final DirectoryScanner scanner = getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( this ); | |||
final String[] directories = scanner.getIncludedDirectories(); | |||
final String[] filesPerSe = scanner.getIncludedFiles(); | |||
m_files = new String[ directories.length + filesPerSe.length ]; | |||
@@ -18,6 +18,7 @@ import org.apache.tools.ant.util.mappers.Mapper; | |||
import org.apache.tools.ant.util.mappers.FileNameMapper; | |||
import org.apache.tools.ant.util.mappers.MergingMapper; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Will set the given property if the specified target has a timestamp greater | |||
@@ -128,7 +129,7 @@ public class UpToDate extends MatchingTask implements Condition | |||
while( upToDate && enum.hasNext() ) | |||
{ | |||
FileSet fs = (FileSet)enum.next(); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
upToDate = upToDate && scanDir( fs.getDir(), | |||
ds.getIncludedFiles() ); | |||
} | |||
@@ -27,6 +27,7 @@ import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ZipFileSet; | |||
import org.apache.tools.ant.types.ZipScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.util.mappers.MergingMapper; | |||
import org.apache.aut.zip.ZipEntry; | |||
import org.apache.aut.zip.ZipOutputStream; | |||
@@ -266,7 +267,7 @@ public class Zip | |||
for( int i = 0; i < m_filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)m_filesets.get( i ); | |||
dss.add( fs.getDirectoryScanner() ); | |||
dss.add( ScannerUtil.getDirectoryScanner( fs ) ); | |||
} | |||
int dssSize = dss.size(); | |||
FileScanner[] scanners = new FileScanner[ dssSize ]; | |||
@@ -556,7 +557,7 @@ public class Zip | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String prefix = ""; | |||
String fullpath = ""; | |||
@@ -17,6 +17,7 @@ import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Marker; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.util.mappers.FileNameMapper; | |||
import org.apache.tools.ant.util.mappers.Mapper; | |||
@@ -369,7 +370,7 @@ public class ExecuteOn | |||
{ | |||
final FileSet fs = (FileSet)m_filesets.get( i ); | |||
final File base = fs.getDir(); | |||
final DirectoryScanner ds = fs.getDirectoryScanner(); | |||
final DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
if( !"dir".equals( m_type ) ) | |||
{ | |||
@@ -26,6 +26,7 @@ import org.apache.tools.ant.util.FileUtils; | |||
import org.apache.tools.ant.util.mappers.FlatFileNameMapper; | |||
import org.apache.tools.ant.util.mappers.IdentityMapper; | |||
import org.apache.tools.ant.types.SourceFileScanner; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* A consolidated copy task. Copies a file or directory to a new file or | |||
@@ -229,7 +230,7 @@ public class Copy | |||
for( int i = 0; i < m_filesets.size(); i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
final File fromDir = fileSet.getDir(); | |||
final String[] srcFiles = scanner.getIncludedFiles(); | |||
@@ -487,7 +488,7 @@ public class Copy | |||
else | |||
{ | |||
FileSet fs = (FileSet)m_filesets.get( 0 ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
if( srcFiles.length > 0 ) | |||
@@ -13,6 +13,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
/** | |||
* Deletes a file or directory, or set of files defined by a fileset. The | |||
@@ -126,7 +127,7 @@ public class Delete | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
try | |||
{ | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] files = ds.getIncludedFiles(); | |||
String[] dirs = ds.getIncludedDirectories(); | |||
removeFiles( fs.getDir(), files, dirs ); | |||
@@ -18,6 +18,7 @@ import org.apache.myrmidon.api.AbstractTask; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Touch a file and/or fileset(s) -- corresponds to the Unix touch command. <p> | |||
@@ -157,7 +158,7 @@ public class Touch | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
final FileSet fs = (FileSet)m_filesets.get( i ); | |||
final DirectoryScanner ds = fs.getDirectoryScanner(); | |||
final DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
final File fromDir = fs.getDir(); | |||
final String[] srcFiles = ds.getIncludedFiles(); | |||
@@ -26,6 +26,7 @@ import org.apache.tools.ant.taskdefs.exec.Execute2; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* This task makes it easy to generate Javadoc documentation for a collection of | |||
@@ -984,7 +985,7 @@ public class Javadoc | |||
final File source = resolveFile( list[ j ] ); | |||
fs.setDir( source ); | |||
final DirectoryScanner ds = fs.getDirectoryScanner(); | |||
final DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
final String[] packageDirs = ds.getIncludedDirectories(); | |||
for( int i = 0; i < packageDirs.length; i++ ) | |||
@@ -21,6 +21,7 @@ import org.apache.tools.ant.taskdefs.MatchingTask; | |||
import org.apache.tools.ant.taskdefs.exec.Execute2; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Create a CAB archive. | |||
@@ -174,7 +175,7 @@ public class Cab | |||
FileSet fs = (FileSet)m_filesets.get( i ); | |||
if( fs != null ) | |||
{ | |||
appendFiles( files, fs.getDirectoryScanner() ); | |||
appendFiles( files, ScannerUtil.getDirectoryScanner( fs ) ); | |||
} | |||
} | |||
} | |||
@@ -36,6 +36,7 @@ import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.PathUtil; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.util.depend.Dependencies; | |||
import org.apache.tools.ant.util.depend.Filter; | |||
import org.xml.sax.InputSource; | |||
@@ -567,7 +568,7 @@ public class GenericDeploymentTool | |||
{ | |||
FileSet supportFileSet = (FileSet)i.next(); | |||
File supportBaseDir = supportFileSet.getDir(); | |||
DirectoryScanner supportScanner = supportFileSet.getDirectoryScanner(); | |||
DirectoryScanner supportScanner = ScannerUtil.getDirectoryScanner( supportFileSet ); | |||
supportScanner.scan(); | |||
String[] supportFiles = supportScanner.getIncludedFiles(); | |||
for( int j = 0; j < supportFiles.length; ++j ) | |||
@@ -23,6 +23,7 @@ import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.taskdefs.MatchingTask; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Translates text embedded in files using Resource Bundle files. | |||
@@ -518,7 +519,7 @@ public class Translate | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
for( int j = 0; j < srcFiles.length; j++ ) | |||
{ | |||
@@ -9,8 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.ide; | |||
import java.io.File; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.api.TaskContext; | |||
import org.apache.myrmidon.framework.Pattern; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
import org.apache.myrmidon.framework.PatternUtil; | |||
/** | |||
* Export packages from the Visual Age for Java workspace. The packages are | |||
@@ -172,9 +174,11 @@ public class VAJExport extends VAJTask | |||
} | |||
// delegate the export to the VAJUtil object. | |||
final TaskContext context = getContext(); | |||
final TaskContext context1 = getContext(); | |||
getUtil().exportPackages( destDir, | |||
patternSet.getIncludePatterns( getContext() ), | |||
patternSet.getExcludePatterns( getContext() ), | |||
PatternUtil.getIncludePatterns( patternSet, context ), | |||
PatternUtil.getExcludePatterns( patternSet, context1 ), | |||
exportClasses, exportDebugInfo, | |||
exportResources, exportSources, | |||
useDefaultExcludes, overwrite ); | |||
@@ -13,6 +13,7 @@ import java.util.Iterator; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Import source, class files, and resources to the Visual Age for Java | |||
@@ -224,7 +225,7 @@ public class VAJImport extends VAJTask | |||
*/ | |||
protected void importFileset( FileSet fileset ) | |||
{ | |||
DirectoryScanner ds = fileset.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fileset ); | |||
if( ds.getIncludedFiles().length == 0 ) | |||
{ | |||
return; | |||
@@ -15,6 +15,7 @@ import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* <p> | |||
@@ -116,7 +117,7 @@ public final class BatchTest extends BaseTest | |||
for( int j = 0; j < size; j++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( j ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
ds.scan(); | |||
String[] f = ds.getIncludedFiles(); | |||
for( int k = 0; k < f.length; k++ ) | |||
@@ -22,6 +22,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
import org.w3c.dom.Document; | |||
import org.w3c.dom.Element; | |||
import org.xml.sax.SAXException; | |||
@@ -201,7 +202,7 @@ public class XMLResultAggregator | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
final FileSet fileSet = (FileSet)filesets.get( i ); | |||
final DirectoryScanner scanner = fileSet.getDirectoryScanner(); | |||
final DirectoryScanner scanner = ScannerUtil.getDirectoryScanner( fileSet ); | |||
scanner.scan(); | |||
final String[] includes = scanner.getIncludedFiles(); | |||
for( int j = 0; j < includes.length; j++ ) | |||
@@ -23,6 +23,7 @@ import org.apache.tools.ant.types.Argument; | |||
import org.apache.tools.ant.types.CommandlineJava; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Somewhat abstract framework to be used for other metama 2.0 tasks. This | |||
@@ -338,7 +339,7 @@ public abstract class AbstractMetamataTask | |||
for( int i = 0; i < m_fileSets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)m_fileSets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
ds.scan(); | |||
String[] f = ds.getIncludedFiles(); | |||
getLogger().debug( i + ") Adding " + f.length + " files from directory " + ds.getBasedir() ); | |||
@@ -23,9 +23,12 @@ import java.io.OutputStream; | |||
import java.util.ArrayList; | |||
import org.apache.avalon.excalibur.io.FileUtil; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.api.TaskContext; | |||
import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.types.FileScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
/** | |||
* Basic FTP client that performs the following actions: | |||
@@ -772,12 +775,14 @@ public class FTP | |||
if( m_action == SEND_FILES ) | |||
{ | |||
ds = fs.getDirectoryScanner(); | |||
ds = ScannerUtil.getDirectoryScanner( fs ); | |||
} | |||
else | |||
{ | |||
ds = new FTPDirectoryScanner( ftp ); | |||
fs.setupDirectoryScanner( ds ); | |||
final FileScanner ds1 = ds; | |||
final TaskContext context = getContext(); | |||
ScannerUtil.setupDirectoryScanner( fs, ds1, context ); | |||
ds.scan(); | |||
} | |||
@@ -27,6 +27,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
/** | |||
* A task to send SMTP email. This version has near identical syntax to the | |||
@@ -309,7 +310,7 @@ public class MimeMail extends Task | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
if( fs != null ) | |||
{ | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String[] dsfiles = ds.getIncludedFiles(); | |||
File baseDir = ds.getBasedir(); | |||
@@ -12,6 +12,7 @@ import java.util.ArrayList; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.tools.ant.types.DirectoryScanner; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* P4Add - add the specified files to perforce. <b>Example Usage:</b> | |||
@@ -125,7 +126,7 @@ public class P4Add extends P4Base | |||
for( int i = 0; i < filesets.size(); i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
//File fromDir = fs.getDir(project); | |||
String[] srcFiles = ds.getIncludedFiles(); | |||
@@ -19,6 +19,7 @@ import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.taskdefs.exec.Execute2; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.tools.ant.types.ScannerUtil; | |||
/** | |||
* Convenient task to run the snapshot merge utility for JProbe Coverage. | |||
@@ -150,7 +151,7 @@ public class CovMerge extends Task | |||
for( int i = 0; i < size; i++ ) | |||
{ | |||
FileSet fs = (FileSet)filesets.get( i ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
ds.scan(); | |||
String[] f = ds.getIncludedFiles(); | |||
for( int j = 0; j < f.length; j++ ) | |||
@@ -20,6 +20,7 @@ import org.apache.myrmidon.api.TaskException; | |||
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.ScannerUtil; | |||
import org.apache.tools.ant.util.regexp.Regexp; | |||
/** | |||
@@ -216,7 +217,7 @@ public class ReplaceRegExp extends Task | |||
for( int i = 0; i < sz; i++ ) | |||
{ | |||
FileSet fs = (FileSet)( filesets.get( i ) ); | |||
DirectoryScanner ds = fs.getDirectoryScanner(); | |||
DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs ); | |||
String files[] = ds.getIncludedFiles(); | |||
for( int j = 0; j < files.length; j++ ) | |||
@@ -12,11 +12,11 @@ import java.io.IOException; | |||
import org.apache.aut.nativelib.Os; | |||
import org.apache.myrmidon.api.TaskException; | |||
import org.apache.myrmidon.framework.Pattern; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
import org.apache.tools.ant.taskdefs.exec.Execute; | |||
import org.apache.tools.ant.taskdefs.exec.ExecuteOn; | |||
import org.apache.tools.ant.types.Argument; | |||
import org.apache.tools.ant.types.FileSet; | |||
import org.apache.myrmidon.framework.PatternSet; | |||
/** | |||
* Chmod equivalent for unix-like environments. | |||
@@ -64,11 +64,8 @@ public class Chmod | |||
/** | |||
* Sets the set of exclude patterns. Patterns may be separated by a comma or | |||
* a space. | |||
* | |||
* @param excludes the string containing the exclude patterns | |||
*/ | |||
public void setExcludes( String excludes ) | |||
throws TaskException | |||
{ | |||
m_defaultSetDefined = true; | |||
m_defaultSet.setExcludes( excludes ); | |||
@@ -96,7 +93,6 @@ public class Chmod | |||
* @param includes the string containing the include patterns | |||
*/ | |||
public void setIncludes( String includes ) | |||
throws TaskException | |||
{ | |||
m_defaultSetDefined = true; | |||
m_defaultSet.setIncludes( includes ); | |||
@@ -127,7 +123,6 @@ public class Chmod | |||
* add a name entry on the include list | |||
*/ | |||
public void addInclude( final Pattern pattern ) | |||
throws TaskException | |||
{ | |||
m_defaultSetDefined = true; | |||
m_defaultSet.addInclude( pattern ); | |||
@@ -135,13 +130,11 @@ public class Chmod | |||
/** | |||
* add a set of patterns | |||
* | |||
*/ | |||
public PatternSet createPatternSet() | |||
throws TaskException | |||
public void addPatternSet( final PatternSet set ) | |||
{ | |||
m_defaultSetDefined = true; | |||
return m_defaultSet.createPatternSet(); | |||
m_defaultSet.addPatternSet( set ); | |||
} | |||
public void execute() | |||
@@ -154,8 +147,10 @@ public class Chmod | |||
else if( isValidOs() ) | |||
{ | |||
// we are chmodding the given directory | |||
addArg( new Argument( m_defaultSet.getDir().getPath() ) ); | |||
Execute execute = prepareExec(); | |||
final Argument argument = | |||
new Argument( m_defaultSet.getDir().getPath() ); | |||
addArg( argument ); | |||
final Execute execute = prepareExec(); | |||
try | |||
{ | |||
execute.setCommandline( getCommand().getCommandline() ); | |||