Remove unused imports from testcases

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@374473 13f79535-47bb-0310-9956-ffa450edef68
19 years ago · c61f9feb53
--- a/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
+++ b/src/testcases/org/apache/tools/ant/DirectoryScannerTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2005 The Apache Software Foundation
 * Copyright  2001-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -18,12 +18,9 @@
 package org.apache.tools.ant;

 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.JavaEnvUtils;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
--- a/src/testcases/org/apache/tools/ant/ExecutorTest.java
+++ b/src/testcases/org/apache/tools/ant/ExecutorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2005 The Apache Software Foundation
 * Copyright 2005-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package org.apache.tools.ant;

 import java.util.Vector;

 import org.apache.tools.ant.taskdefs.Exit;

 /**
 * Executor tests
--- a/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
+++ b/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2001,2003-2004 The Apache Software Foundation
 * Copyright  2000-2001,2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import junit.framework.AssertionFailedError;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Hashtable;
--- a/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/DynamicFilterTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2005 The Apache Software Foundation
 * Copyright  2003-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,12 +17,10 @@

 package org.apache.tools.ant.filters;

 import java.io.File;
 import java.io.Reader;
 import java.io.FileReader;
 import java.io.IOException;

 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.util.FileUtils;

--- a/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/NoNewLineTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,11 +17,9 @@

 package org.apache.tools.ant.filters;

 import java.io.File;
 import java.io.IOException;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.util.FileUtils;

 /** JUnit Testcases for No new line when filterchain used
 */
--- a/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
+++ b/src/testcases/org/apache/tools/ant/filters/TokenFilterTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2005 The Apache Software Foundation
 * Copyright  2003-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.filters;

 import java.io.File;
 import java.io.Reader;
 import java.io.FileReader;
 import java.io.IOException;
--- a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002, 2004-2005 The Apache Software Foundation
 * Copyright  2000-2002, 2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -18,8 +18,6 @@
 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.JavaEnvUtils;

 /**
 * JUnit test for the Available task/condition.
--- a/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/BUnzip2Test.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2005 The Apache Software Foundation
 * Copyright  2001-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.util.FileUtils;

 import java.io.IOException;

 /**
 */
--- a/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/BasenameTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004 The Apache Software Foundation
 * Copyright  2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CallTargetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -20,8 +20,6 @@ package org.apache.tools.ant.taskdefs;
 import java.util.Vector;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.JavaEnvUtils;

 /**
 */
--- a/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ChecksumTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001,2003-2005 The Apache Software Foundation
 * Copyright  2001,2003-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.BuildFileTest;

 import java.io.IOException;
 import java.io.File;

 /**
 */
--- a/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ConditionTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002, 2004-2005 The Apache Software Foundation
 * Copyright  2002, 2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,10 +16,7 @@
 */
 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 import java.lang.reflect.InvocationTargetException;

 /**
 * @created 13 January 2002
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2001,2004 The Apache Software Foundation
 * Copyright  2000-2001,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DemuxOutputTask.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002-2004 The Apache Software Foundation
 * Copyright  2002-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
 */
 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.*;
 import org.apache.tools.ant.BuildFileTest;
 import java.util.Random;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;

 /**
 * A simple task that prints to System.out and System.err and then catches
 * the output which it then checks. If the output does not match, an
--- a/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DirnameTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004 The Apache Software Foundation
 * Copyright  2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.taskdefs.condition.Os;

--- a/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ExecuteOnTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2004-2005 The Apache Software Foundation.
 * Copyright 2004-2006 The Apache Software Foundation.
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@

 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.util.FileUtils;

 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.OutputStream;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.util.FileUtils;

 /**
 * Unit test for the &lt;apply&gt; task.
--- a/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2000-2001, 2004-2005 The Apache Software Foundation
 * Copyright 2000-2001, 2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004-2005 The Apache Software Foundation
 * Copyright  2000-2002,2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/InputTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2002,2004-2005 The Apache Software Foundation
 * Copyright  2001-2002,2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import java.io.InputStream;
 import java.io.FileInputStream;

 import org.apache.tools.ant.BuildFileTest;
--- a/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/LoadFileTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2002,2004 The Apache Software Foundation
 * Copyright  2001-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,10 +16,8 @@
 */
 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;

 /**
 * Test the load file task
--- a/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/LoadPropertiesTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004-2005 The Apache Software Foundation
 * Copyright  2002,2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.*;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/MacroDefTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2005 The Apache Software Foundation
 * Copyright  2003-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,10 +17,8 @@

 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildFileTest;

 /**
 */
--- a/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/MultiMapTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,10 +17,7 @@

 package org.apache.tools.ant.taskdefs;

 import java.lang.reflect.Method;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.util.FileNameMapper;


--- a/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ParallelTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002-2004 The Apache Software Foundation
 * Copyright  2002-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@
 */
 package org.apache.tools.ant.taskdefs;
 import java.io.PrintStream;

 import junit.framework.AssertionFailedError;
 import org.apache.tools.ant.BuildException;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.DemuxOutputStream;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

 /**
 * Test of the parallel TaskContainer
--- a/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/PreSetDefTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,9 +17,8 @@

 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.FileSet;

--- a/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/StyleTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2005 The Apache Software Foundation
 * Copyright  2003-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@
 package org.apache.tools.ant.taskdefs;


 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.util.FileUtils;

 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.FileWriter;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.taskdefs.optional.XsltTest;
 import org.apache.tools.ant.util.FileUtils;


 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/SubAntTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2005 The Apache Software Foundation
 * Copyright  2003-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@ import junit.framework.AssertionFailedError;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.input.InputHandler;
 import org.apache.tools.ant.types.Path;

 /**
 */
--- a/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/SyncTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2004-2005 The Apache Software Foundation
 * Copyright 2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import java.io.File;

 public class SyncTest extends BuildFileTest {

--- a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2001,2004 The Apache Software Foundation
 * Copyright  2000-2001,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import junit.framework.*;
 import java.io.*;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2005 The Apache Software Foundation
 * Copyright  2001-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/XmlnsTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2005 The Apache Software Foundation
 * Copyright  2000-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@

 package org.apache.tools.ant.taskdefs;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.zip.UnixStat;

 import java.io.File;
 import java.io.IOException;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import java.util.Enumeration;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.zip.UnixStat;

 /**
 */
--- a/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/condition/IsReferenceTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004 The Apache Software Foundation
 * Copyright  2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 */
 package org.apache.tools.ant.taskdefs.condition;

 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/DotnetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002-2005 The Apache Software Foundation
 * Copyright  2002-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 */
 package org.apache.tools.ant.taskdefs.optional;

 import java.io.*;
 import java.util.Properties;

 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/JspcTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002-2004 The Apache Software Foundation
 * Copyright  2002-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,16 +16,14 @@
 */
 package org.apache.tools.ant.taskdefs.optional;

 import java.io.*;
 import java.util.Properties;
 import java.io.File;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
 import org.apache.tools.ant.taskdefs.optional.jsp.Jasper41Mangler;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspMangler;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspNameMangler;
 import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory;
 import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapter;
 import org.apache.tools.ant.taskdefs.optional.jsp.compilers.JspCompilerAdapterFactory;

 /**
 * Tests the Jspc task.
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2004 The Apache Software Foundation
 * Copyright  2001-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,13 +16,12 @@
 */
 package org.apache.tools.ant.taskdefs.optional;

 import org.apache.tools.ant.BuildFileTest;

 import java.util.Properties;
 import java.io.FileOutputStream;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.Properties;

 import org.apache.tools.ant.BuildFileTest;

 /**
 *  JUnit testcase that excercises the optional PropertyFile task in ant.
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001,2004 The Apache Software Foundation
 * Copyright  2001,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.taskdefs.optional;

 import java.io.*;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/WsdlToDotnetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004 The Apache Software Foundation
 * Copyright  2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,9 +16,6 @@
 */
 package org.apache.tools.ant.taskdefs.optional;

 import java.io.*;
 import java.util.Properties;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.taskdefs.optional.dotnet.WsdlToDotnet;

--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/XmlValidateCatalogTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004 The Apache Software Foundation
 * Copyright  2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,10 +16,6 @@
 */
 package org.apache.tools.ant.taskdefs.optional;

 import java.io.*;
 import java.util.Properties;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;

 /**
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2004 The Apache Software Foundation
 * Copyright  2001-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,17 +17,11 @@

 package org.apache.tools.ant.taskdefs.optional.depend;

 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Vector;
 import java.util.Enumeration;
 import java.util.Hashtable;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;

 /**
 * Testcase for the Depend optional task.
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,17 +17,7 @@

 package org.apache.tools.ant.taskdefs.optional.jdepend;

 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Vector;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.DirectoryScanner;

 /**
 * Testcase for the JDepend optional task.
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/junit/TestFormatter.java
@@ -19,9 +19,10 @@ package org.apache.tools.ant.taskdefs.optional.junit;

 import java.io.IOException;
 import java.io.OutputStream;
 import java.text.NumberFormat;

 import junit.framework.AssertionFailedError;
 import junit.framework.Test;

 import org.apache.tools.ant.BuildException;

 public class TestFormatter implements JUnitResultFormatter {
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassFileTest.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.io.InputStream;

 import junit.framework.TestCase;
 import org.apache.tools.ant.util.JavaEnvUtils;

 import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile;
 import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo;

--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/sitraka/ClassPathLoaderTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001,2003-2004 The Apache Software Foundation
 * Copyright  2001,2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
 package org.apache.tools.ant.taskdefs.optional.sitraka;

 import java.util.Hashtable;
 import java.io.File;

 import junit.framework.TestCase;
 import org.apache.tools.ant.types.Path;

 import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader;
 import org.apache.tools.ant.types.Path;

 /**
 * Minimal testing for the classpath loader..
--- a/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/AbstractFileSetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004 The Apache Software Foundation
 * Copyright  2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import java.io.File;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

 /**
 * Base class for FileSetTest and DirSetTest.
--- a/src/testcases/org/apache/tools/ant/types/AddTypeTest.java
+++ b/src/testcases/org/apache/tools/ant/types/AddTypeTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
--- a/src/testcases/org/apache/tools/ant/types/CommandlineTest.java
+++ b/src/testcases/org/apache/tools/ant/types/CommandlineTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,12 +17,9 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import org.apache.tools.ant.BuildException;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.CommandLine
--- a/src/testcases/org/apache/tools/ant/types/DescriptionTest.java
+++ b/src/testcases/org/apache/tools/ant/types/DescriptionTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2002,2004 The Apache Software Foundation
 * Copyright  2001-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,15 +17,8 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.*;

 /**
 * FilterSet testing
 *
--- a/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java
+++ b/src/testcases/org/apache/tools/ant/types/EnumeratedAttributeTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2001,2004 The Apache Software Foundation
 * Copyright  2000-2001,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,10 +17,9 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import org.apache.tools.ant.BuildException;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.EnumeratedAttribute.
--- a/src/testcases/org/apache/tools/ant/types/FileListTest.java
+++ b/src/testcases/org/apache/tools/ant/types/FileListTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001,2004 The Apache Software Foundation
 * Copyright  2001,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,15 +17,11 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.Project;
 import java.io.File;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;

 /**
 * Some tests for filelist.
 */
--- a/src/testcases/org/apache/tools/ant/types/FileSetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/FileSetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,13 +17,6 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.types.FileSet.
--- a/src/testcases/org/apache/tools/ant/types/FilterSetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/FilterSetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2002, 2004-2005 The Apache Software Foundation
 * Copyright  2001-2002, 2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,16 +17,13 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.*;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Hashtable;

 import org.apache.tools.ant.BuildFileTest;

 /**
 * FilterSet testing
 *
--- a/src/testcases/org/apache/tools/ant/types/MapperTest.java
+++ b/src/testcases/org/apache/tools/ant/types/MapperTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,17 +17,19 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.*;
 import org.apache.tools.ant.BuildFileTest;
 import java.util.Arrays;
 import java.util.List;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import java.util.List;
 import java.util.Arrays;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.ChainedMapper;
 import org.apache.tools.ant.util.FileNameMapper;
 import org.apache.tools.ant.util.FlatFileNameMapper;
 import org.apache.tools.ant.util.GlobPatternMapper;
 import org.apache.tools.ant.util.MergingMapper;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.types.Mapper.
--- a/src/testcases/org/apache/tools/ant/types/PathTest.java
+++ b/src/testcases/org/apache/tools/ant/types/PathTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2004 The Apache Software Foundation
 * Copyright  2000-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,15 +17,14 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Os;
 import java.io.File;
 import java.util.Locale;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import java.util.Locale;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.Os;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.types.Path
--- a/src/testcases/org/apache/tools/ant/types/PatternSetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/PatternSetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import java.io.File;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.types.PatternSet.
--- a/src/testcases/org/apache/tools/ant/types/PolyTest.java
+++ b/src/testcases/org/apache/tools/ant/types/PolyTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,11 +17,9 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.condition.Condition;

 public class PolyTest extends BuildFileTest {

--- a/src/testcases/org/apache/tools/ant/types/PropertySetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/PropertySetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2005 The Apache Software Foundation
 * Copyright 2005-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,11 +17,7 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.condition.Condition;

 public class PropertySetTest extends BuildFileTest {

--- a/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java
+++ b/src/testcases/org/apache/tools/ant/types/ResourceOutputTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2005 The Apache Software Foundation
 * Copyright 2005-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,20 +19,17 @@ package org.apache.tools.ant.types;

 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.UnknownServiceException;

 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Zip;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.resources.ImmutableResourceException;
 import org.apache.tools.ant.types.resources.PropertyResource;
 import org.apache.tools.ant.types.resources.StringResource;
 import org.apache.tools.ant.types.resources.URLResource;
 import org.apache.tools.ant.types.resources.ZipResource;
 import org.apache.tools.ant.types.resources.FileResource;
 import org.apache.tools.ant.types.resources.StringResource;
 import org.apache.tools.ant.types.resources.PropertyResource;
 import org.apache.tools.ant.types.resources.ImmutableResourceException;
 import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.util.ResourceUtils;

--- a/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/TarFileSetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2005 The Apache Software Foundation
 * Copyright 2005-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,14 +17,10 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;

 import org.apache.tools.ant.BuildException;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.types.TarFileSet.
 *
--- a/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java
+++ b/src/testcases/org/apache/tools/ant/types/XMLCatalogBuildFileTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2002,2004-2005 The Apache Software Foundation
 * Copyright  2001-2002,2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,13 +17,8 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 /**
 * BuildFileTest testcases for org.apache.tools.ant.types.XMLCatalog
 *
--- a/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
+++ b/src/testcases/org/apache/tools/ant/types/XMLCatalogTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2004 The Apache Software Foundation
 * Copyright  2000-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,24 +17,19 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DefaultLogger;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.JAXPUtils;

 import junit.framework.TestCase;

 import java.io.File;

 import java.net.MalformedURLException;
 import java.net.URL;

 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;

 import javax.xml.transform.Source;
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.TransformerException;

 import junit.framework.TestCase;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.JAXPUtils;
 import org.xml.sax.InputSource;

 /**
 * JUnit testcases for org.apache.tools.ant.types.XMLCatalog
--- a/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/ZipFileSetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,14 +17,10 @@

 package org.apache.tools.ant.types;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;

 import org.apache.tools.ant.BuildException;

 /**
 * JUnit 3 testcases for org.apache.tools.ant.types.ZipFileSet.
 *
--- a/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
+++ b/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2005 The Apache Software Foundation
 * Copyright  2001-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -18,16 +18,12 @@
 package org.apache.tools.ant.types.optional.depend;

 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Vector;
 import java.util.Enumeration;
 import java.util.Hashtable;

 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.DirectoryScanner;

 /**
 * Testcase for the Classfileset optional type.
--- a/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/BaseSelectorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2004 The Apache Software Foundation
 * Copyright  2000-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,14 +17,13 @@

 package org.apache.tools.ant.types.selectors;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;
 import java.io.File;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;

 /**
 * Base test case for Selectors. Provides a shared test as well as
--- a/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/ContainsRegexpTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,14 +17,12 @@

 package org.apache.tools.ant.types.selectors;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;
 import java.io.File;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 import java.io.File;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;


 public class ContainsRegexpTest extends TestCase {
--- a/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/ContainsSelectorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002-2004 The Apache Software Foundation
 * Copyright  2002-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,13 +19,8 @@ package org.apache.tools.ant.types.selectors;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.*;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.types.Parameter;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 /**
 * Tests Contains Selectors.
 *
--- a/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/DepthSelectorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,13 +19,8 @@ package org.apache.tools.ant.types.selectors;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.*;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.types.Parameter;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 /**
 * Tests Depth Selectors
 *
--- a/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/FilenameSelectorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2004 The Apache Software Foundation
 * Copyright  2000-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,13 +19,8 @@ package org.apache.tools.ant.types.selectors;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.*;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.types.Parameter;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 /**
 * Tests Filename Selectors
 *
--- a/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/ModifiedSelectorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2005 The Apache Software Foundation
 * Copyright  2003-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -20,24 +20,25 @@ package org.apache.tools.ant.types.selectors;

 // Java
 import java.io.File;
 import java.text.RuleBasedCollator;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.text.RuleBasedCollator;

 // Ant
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.Path;

 // inside MockProject
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildEvent;

 // The classes to test
 import org.apache.tools.ant.types.selectors.modifiedselector.*;
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.selectors.modifiedselector.Algorithm;
 import org.apache.tools.ant.types.selectors.modifiedselector.Cache;
 import org.apache.tools.ant.types.selectors.modifiedselector.ChecksumAlgorithm;
 import org.apache.tools.ant.types.selectors.modifiedselector.DigestAlgorithm;
 import org.apache.tools.ant.types.selectors.modifiedselector.EqualComparator;
 import org.apache.tools.ant.types.selectors.modifiedselector.HashvalueAlgorithm;
 import org.apache.tools.ant.types.selectors.modifiedselector.ModifiedSelector;
 import org.apache.tools.ant.types.selectors.modifiedselector.PropertiesfileCache;
 import org.apache.tools.ant.util.FileUtils;


--- a/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/SizeSelectorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,13 +19,8 @@ package org.apache.tools.ant.types.selectors;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.*;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.types.Parameter;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 /**
 * Tests Size Selectors
 *
--- a/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java
+++ b/src/testcases/org/apache/tools/ant/types/selectors/TypeSelectorTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -18,17 +18,6 @@
 package org.apache.tools.ant.types.selectors;

 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildFileTest;
 import org.apache.tools.ant.types.Parameter;
 import org.apache.tools.ant.util.JavaEnvUtils;

 import java.text.SimpleDateFormat;
 import java.text.ParsePosition;
 import java.util.Date;

 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;

 /**
 * Tests Type Selectors.
--- a/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java
+++ b/src/testcases/org/apache/tools/ant/util/ClasspathUtilsTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@

 package org.apache.tools.ant.util;

 import java.io.File;
 import java.io.IOException;
 import java.util.Enumeration;

 import junit.framework.TestCase;

 import org.apache.tools.ant.BuildException;
--- a/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java
+++ b/src/testcases/org/apache/tools/ant/util/DOMElementWriterTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2005 The Apache Software Foundation
 * Copyright  2000-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ package org.apache.tools.ant.util;

 import java.io.IOException;
 import java.io.StringWriter;
 import junit.framework.Test;

 import junit.framework.TestCase;
 import junit.framework.TestSuite;

 import org.w3c.dom.Document;
 import org.w3c.dom.Element;

--- a/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java
+++ b/src/testcases/org/apache/tools/ant/util/DateUtilsTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2002,2004 The Apache Software Foundation
 * Copyright  2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 */
 package org.apache.tools.ant.util;

 import java.util.Date;
 import java.util.Calendar;
 import java.util.TimeZone;

--- a/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java
+++ b/src/testcases/org/apache/tools/ant/util/GlobPatternMapperTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000,2004 The Apache Software Foundation
 * Copyright  2000,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,9 +17,7 @@

 package org.apache.tools.ant.util;

 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

 /**
 * Tests for org.apache.tools.ant.util;GlobPatternMapper.
--- a/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java
+++ b/src/testcases/org/apache/tools/ant/util/ResourceUtilsTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2003-2004 The Apache Software Foundation
 * Copyright  2003-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,15 +17,13 @@

 package org.apache.tools.ant.util;

 import junit.framework.TestCase;

 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Echo;
 import org.apache.tools.ant.types.Resource;
 import org.apache.tools.ant.types.ResourceFactory;

 import java.io.File;

 import junit.framework.TestCase;

 /**
 * Tests for org.apache.tools.ant.util.ResourceUtils.
 */
--- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
+++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2002,2004 The Apache Software Foundation
 * Copyright  2000-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -21,8 +21,6 @@ import java.io.IOException;

 import junit.framework.AssertionFailedError;

 import org.apache.tools.ant.taskdefs.condition.Os;

 /**
 * Tests for the jakarta-regexp implementation of the RegexpMatcher interface.
 *
--- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java
+++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpRegexpTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2001-2002,2004 The Apache Software Foundation
 * Copyright  2001-2002,2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -21,8 +21,6 @@ import java.io.IOException;

 import junit.framework.AssertionFailedError;

 import org.apache.tools.ant.taskdefs.condition.Os;

 /**
 * Tests for the jakarta-regexp implementation of the Regexp interface.
 *
--- a/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java
+++ b/src/testcases/org/apache/tools/ant/util/regexp/RegexpMatcherTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright  2000-2004 The Apache Software Foundation
 * Copyright  2000-2004,2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,12 +17,10 @@

 package org.apache.tools.ant.util.regexp;

 import java.io.*;
 import java.io.IOException;
 import java.util.Vector;

 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

 /**
 * Tests for all implementations of the RegexpMatcher interface.
--- a/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java
+++ b/src/testcases/org/apache/tools/zip/ZipOutputStreamTest.java
@@ -1,5 +1,5 @@
 /*
 * Copyright 2004-2005 The Apache Software Foundation
 * Copyright 2004-2006 The Apache Software Foundation
 *
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
@@ -17,13 +17,11 @@

 package org.apache.tools.zip;

 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;

 import java.util.Calendar;
 import java.util.Date;

 import junit.framework.TestCase;

 public class ZipOutputStreamTest extends TestCase {
    
    private Date time;