@@ -13,12 +13,12 @@ import java.util.StringTokenizer;
import org.apache.myrmidon.api.TaskContext;
import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.framework.PatternUtil;
import org.apache.myrmidon.framework.FileSet;
import org.apache.tools.todo.taskdefs.archive.TarFileSet;
import org.apache.tools.todo.taskdefs.archive.ZipFileSet;
import org.apache.tools.todo.taskdefs.archive.ZipScanner;
import org.apache.tools.todo.types.DirectoryScanner;
import org.apache.tools.todo.types.FileScanner;
import org.apache.tools.todo.types.FileSet;
/**
*
@@ -534,32 +534,6 @@ public class ScannerUtil
}
}
public static void setupDirectoryScanner( final org.apache.myrmidon.framework.FileSet set,
final FileScanner scanner,
final TaskContext context )
throws TaskException
{
if( null == scanner )
{
final String message = "ds cannot be null";
throw new IllegalArgumentException( message );
}
scanner.setBasedir( set.getDir() );
/*final String message = "FileSet: Setup file scanner in dir " +
set.getDir() + " with " + set;
getLogger().debug( message );*/
scanner.setIncludes( PatternUtil.getIncludePatterns( set, context ) );
scanner.setExcludes( PatternUtil.getExcludePatterns( set, context ) );
if( set.includeDefaultExcludes() )
{
scanner.addDefaultExcludes();
}
scanner.setCaseSensitive( true );
}
public static void setupDirectoryScanner( final FileSet set,
final FileScanner scanner,
final TaskContext context )
@@ -583,7 +557,7 @@ public class ScannerUtil
{
scanner.addDefaultExcludes();
}
scanner.setCaseSensitive( set.isCaseSensitive() );
scanner.setCaseSensitive( true );
}
public static DirectoryScanner getDirectoryScanner( final FileSet set )
@@ -613,33 +587,6 @@ public class ScannerUtil
return scanner;
}
public static DirectoryScanner getDirectoryScanner( final org.apache.myrmidon.framework.FileSet set )
throws TaskException
{
final File dir = set.getDir();
if( null == dir )
{
final String message = "No directory specified for fileset.";
throw new TaskException( message );
}
if( !dir.exists() )
{
final String message = dir.getAbsolutePath() + " not found.";
throw new TaskException( message );
}
if( !dir.isDirectory() )
{
final String message = dir.getAbsolutePath() + " is not a directory.";
throw new TaskException( message );
}
final DirectoryScanner scanner = new DirectoryScanner();
setupDirectoryScanner( set, scanner, null );
scanner.scan();
return scanner;
}
public static DirectoryScanner getZipScanner( final ZipFileSet set )
throws TaskException
{
adammurdoch