restyled

Removed setAntRun() calls from Execute class

Renamed Environment to EnvironmentData


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270314 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java

@@ -14,9 +14,8 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java

@@ -37,7 +37,7 @@ public class BUnzip2 extends Unpack
         if( source.lastModified() > dest.lastModified() )
         {
             getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
-                 + dest.getAbsolutePath() );
+                              + dest.getAbsolutePath() );
 
             FileOutputStream out = null;
             CBZip2InputStream zIn = null;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java

@@ -17,10 +17,9 @@ import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java

@@ -11,9 +11,9 @@ import java.io.File;
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
+import org.apache.tools.ant.taskdefs.exec.Execute;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
-import org.apache.tools.ant.taskdefs.exec.Execute;
 
 /**
  * Chmod equivalent for unix-like environments.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java

@@ -8,9 +8,9 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.DirectoryScanner;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Hashtable;
 import java.util.ArrayList;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java

@@ -13,8 +13,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Date;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import org.apache.avalon.excalibur.io.FileUtil;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java

@@ -37,7 +37,7 @@ public class GUnzip extends Unpack
         if( source.lastModified() > dest.lastModified() )
         {
             getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
-                 + dest.getAbsolutePath() );
+                              + dest.getAbsolutePath() );
 
             FileOutputStream out = null;
             GZIPInputStream zIn = null;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java

@@ -7,13 +7,12 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.exec.ExecTask;
-import org.apache.tools.ant.types.Commandline;
 
 /**
  * Generates a key.

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java

@@ -271,7 +271,7 @@ public class Get extends Task
                 {
                     Date t = new Date( remoteTimestamp );
                     getLogger().info( "last modified = " + t.toString()
-                         + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) );
+                                      + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) );
                 }
                 if( remoteTimestamp != 0 )
                     touchFile( dest, remoteTimestamp );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java

@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.StringTokenizer;
 import java.util.ArrayList;
+import java.util.StringTokenizer;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Jar.java

@@ -17,8 +17,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Reader;
-import java.util.Iterator;
 import java.util.Enumeration;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.FileScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java

@@ -16,11 +16,11 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
 import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.EnvironmentData;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 
@@ -166,7 +166,7 @@ public class Java extends Task
      *
      * @param sysp The feature to be added to the Sysproperty attribute
      */
-    public void addSysproperty( Environment.Variable sysp )
+    public void addSysproperty( EnvironmentData.Variable sysp )
     {
         cmdl.addSysproperty( sysp );
     }
@@ -385,8 +385,6 @@ public class Java extends Task
                 exe = new Execute( new PumpStreamHandler( fos ), null );
             }
 
-            exe.setAntRun( getProject() );
-
             if( dir == null )
             {
                 dir = getBaseDirectory();

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.DirectoryScanner;
@@ -774,9 +774,9 @@ public class Javac extends MatchingTask
             CompilerAdapter adapter = CompilerAdapterFactory.getCompiler(
                 compiler, this );
             getLogger().info( "Compiling " + compileList.length +
-                 " source file"
-                 + ( compileList.length == 1 ? "" : "s" )
-                 + ( destDir != null ? " to " + destDir : "" ) );
+                              " source file"
+                              + ( compileList.length == 1 ? "" : "s" )
+                              + ( destDir != null ? " to " + destDir : "" ) );
 
             // now we need to populate the compiler adapter
             adapter.setJavac( this );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java

@@ -12,9 +12,9 @@ import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.DirectoryScanner;
@@ -28,7 +28,6 @@ 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.Reference;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * This task makes it easy to generate Javadoc documentation for a collection of
@@ -918,7 +917,6 @@ public class Javadoc extends Task
         JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO );
         JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN );
         Execute exe = new Execute( new PumpStreamHandler( out, err ) );
-        exe.setAntRun( getProject() );
 
         /*
          * No reason to change the working directory as all filenames and

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java

@@ -18,10 +18,10 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
@@ -735,15 +735,15 @@ public class Manifest extends Task
             if( attribute.getName().equalsIgnoreCase( ATTRIBUTE_NAME ) )
             {
                 warnings.add( "\"" + ATTRIBUTE_NAME + "\" attributes should not occur in the " +
-                                     "main section and must be the first element in all " +
-                                     "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
+                              "main section and must be the first element in all " +
+                              "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
                 return attribute.getValue();
             }
 
             if( attribute.getName().toLowerCase().startsWith( ATTRIBUTE_FROM.toLowerCase() ) )
             {
                 warnings.add( "Manifest attributes should not start with \"" +
-                                     ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
+                              ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
             }
             else
             {

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Recorder.java

@@ -143,7 +143,7 @@ public class Recorder extends Task
             throw new TaskException( "No filename specified" );
 
         log( "setting a recorder for name " + filename,
-                          Project.MSG_DEBUG );
+             Project.MSG_DEBUG );
 
         // get the recorder entry
         RecorderEntry recorder = getRecorder( filename, getProject() );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java

@@ -20,12 +20,11 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
-import java.util.Properties;
 import java.util.ArrayList;
+import java.util.Properties;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * Replaces all occurrences of one or more string tokens with given values in

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java

@@ -26,10 +26,10 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.DirectoryScanner;
@@ -366,7 +366,7 @@ public class SQLExec extends Task
      * @return Description of the Returned Value
      */
     public Path createClasspath()
-    throws TaskException
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -580,7 +580,7 @@ public class SQLExec extends Task
         }
 
         getLogger().info( goodSql + " of " + totalSql +
-             " SQL statements executed successfully" );
+                          " SQL statements executed successfully" );
     }
 
     /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java

@@ -12,9 +12,9 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java

@@ -9,7 +9,6 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java

@@ -11,8 +11,8 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java

@@ -12,8 +12,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.DateFormat;
 import java.text.ParseException;
-import java.util.Locale;
 import java.util.ArrayList;
+import java.util.Locale;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java

@@ -8,15 +8,15 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Locale;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java

@@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.EnvironmentData;
 
 /**
  * Executes a given command if the os platform is appropriate.
@@ -35,7 +35,7 @@ public class ExecTask extends Task
     protected boolean failOnError = false;
     protected boolean newEnvironment = false;
     private Integer timeout = null;
-    private Environment env = new Environment();
+    private EnvironmentData env = new EnvironmentData();
     protected Commandline cmdl = new Commandline();
     private FileOutputStream fos = null;
     private ByteArrayOutputStream baos = null;
@@ -173,7 +173,7 @@ public class ExecTask extends Task
      *
      * @param var The feature to be added to the Env attribute
      */
-    public void addEnv( Environment.Variable var )
+    public void addEnv( EnvironmentData.Variable var )
     {
         env.addVariable( var );
     }
@@ -393,7 +393,6 @@ public class ExecTask extends Task
         log( cmdl.toString(), Project.MSG_VERBOSE );
 
         Execute exe = new Execute( createHandler(), createWatchdog() );
-        exe.setAntRun( getProject() );
         exe.setWorkingDirectory( dir );
         exe.setVMLauncher( vmLauncher );
         String[] environment = env.getVariables();

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java

@@ -15,8 +15,8 @@ import java.net.URL;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.Execute;
 import org.apache.tools.ant.taskdefs.ExecuteJava;
+import org.apache.tools.ant.taskdefs.exec.Execute;
 import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
@@ -229,7 +229,6 @@ public class ANTLR extends Task
     {
         Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
                                                          Project.MSG_WARN ), null );
-        exe.setAntRun( getProject() );
         if( workingdir != null )
         {
             exe.setWorkingDirectory( workingdir );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java

@@ -12,8 +12,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.DirectoryScanner;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java

@@ -22,8 +22,8 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.taskdefs.Javac;
 import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.taskdefs.file.Mkdir;
 import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter;
+import org.apache.tools.ant.taskdefs.file.Mkdir;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java

@@ -8,9 +8,9 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java

@@ -17,7 +17,6 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.ListIterator;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java

@@ -11,11 +11,11 @@ import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import netrexx.lang.Rexx;
 import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.myrmidon.api.TaskException;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java

@@ -20,12 +20,12 @@ import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.GregorianCalendar;
+import java.util.Iterator;
 import java.util.Properties;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
@@ -247,7 +247,7 @@ public class PropertyFile extends Task
             else
             {
                 getLogger().info( "Creating new property file: " +
-                     m_propertyfile.getAbsolutePath() );
+                                  m_propertyfile.getAbsolutePath() );
                 FileOutputStream out = null;
                 try
                 {

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java

@@ -189,7 +189,6 @@ public class Rpm extends Task
 
         Execute exe = new Execute( streamhandler, null );
 
-        exe.setAntRun( getProject() );
         if( topDir == null ) topDir = getBaseDirectory();
         exe.setWorkingDirectory( topDir );
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java

@@ -12,8 +12,8 @@ import com.ibm.bsf.BSFManager;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.Hashtable;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java

@@ -112,7 +112,6 @@ public abstract class Continuus extends Task
         try
         {
             Execute exe = new Execute( handler );
-            exe.setAntRun( getProject() );
             exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java

@@ -7,13 +7,13 @@
  */
 package org.apache.tools.ant.taskdefs.optional.clearcase;
 
+import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.exec.Execute;
 import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;
-import java.io.IOException;
 
 /**
  * A base class for creating tasks for executing commands on ClearCase. <p>
@@ -110,7 +110,6 @@ public abstract class ClearCase extends Task
         {
             Project aProj = getProject();
             Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) );
-            exe.setAntRun( aProj );
             exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.java

@@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.depend;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Stack;
-import java.util.ArrayList;
 
 /**
  * An iterator which iterates through the contents of a java directory. The

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.java

@@ -9,9 +9,9 @@ package org.apache.tools.ant.taskdefs.optional.depend.constantpool;
 
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
 
 /**
  * The constant pool of a Java class. The constant pool is a collection of

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java

@@ -204,7 +204,6 @@ public class NetCommand
         ExecuteStreamHandler handler = new LogStreamHandler( _owner,
                                                              Project.MSG_INFO, Project.MSG_WARN );
         _exe = new Execute( handler, null );
-        _exe.setAntRun( _owner.getProject() );
         _exe.setWorkingDirectory( dir );
     }
 }//class

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java

@@ -13,14 +13,14 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Iterator;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.taskdefs.exec.Execute;
 import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
-import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.Path;
 
@@ -361,7 +361,6 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
 
         execTask = new Execute( this );
         Project project = getTask().getProject();
-        execTask.setAntRun( project );
         execTask.setWorkingDirectory( project.getBaseDir() );
 
         Commandline commandline = new Commandline();
@@ -418,7 +417,7 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
     {
         //UGLY HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         //getTask().getProject().addTaskDefinition( "internal_bas_generateclient",
-       //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
+        //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
 
         org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient gentask = null;
         log( "generate client for " + sourceJar, Project.MSG_INFO );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java

@@ -11,8 +11,8 @@ import java.io.File;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.exec.ExecTask;
 import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.taskdefs.exec.ExecTask;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java

@@ -160,7 +160,7 @@ public class Ejbc extends MatchingTask
 
         String systemClassPath = System.getProperty( "java.class.path" );
         String execClassPath = getProject().translatePath( systemClassPath + ":" + classpath +
-                                                      ":" + generatedFilesDirectory );
+                                                           ":" + generatedFilesDirectory );
         // get all the files in the descriptor directory
         DirectoryScanner ds = super.getDirectoryScanner( descriptorDirectory );
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java

@@ -12,7 +12,6 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Iterator;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.jar.JarEntry;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java

@@ -11,7 +11,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Iterator;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.jar.JarEntry;
@@ -23,7 +22,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Java;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.EnvironmentData;
 import org.apache.tools.ant.types.Path;
 
 /**
@@ -965,9 +964,9 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool
 
 
 
-                // Set the Environment variable
+                // Set the EnvironmentData variable
 
-                Environment.Variable var = new Environment.Variable();
+                EnvironmentData.Variable var = new EnvironmentData.Variable();
                 var.setKey( "websphere.lib.dir" );
                 var.setValue( getTask().getProject().getProperty( "websphere.home" ) + "/lib" );
                 javaTask.addSysproperty( var );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java

@@ -15,9 +15,9 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
+import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Locale;
-import java.util.ArrayList;
 import org.apache.avalon.excalibur.io.FileUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java

@@ -38,12 +38,12 @@ import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
+import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.StringUtils;
-import org.apache.avalon.framework.ExceptionUtil;
 
 /**
  * This is a simple grafical user interface to provide the information needed by

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJBuildInfo.java

@@ -10,9 +10,9 @@ package org.apache.tools.ant.taskdefs.optional.ide;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs.optional.ide;
 
 import java.lang.reflect.Field;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.types.FileSet;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJLocalUtil.java

@@ -17,8 +17,8 @@ import com.ibm.ivj.util.base.ToolEnv;
 import com.ibm.ivj.util.base.Type;
 import com.ibm.ivj.util.base.Workspace;
 import java.io.File;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJRemoteUtil.java

@@ -14,8 +14,8 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java

@@ -12,9 +12,9 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.util.StringUtils;
-import org.apache.avalon.framework.ExceptionUtil;
 
 /**
  * Abstract base class to provide common services for the VAJ tool API servlets

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJWorkspaceScanner.java

@@ -11,9 +11,9 @@ import com.ibm.ivj.util.base.IvjException;
 import com.ibm.ivj.util.base.Package;
 import com.ibm.ivj.util.base.Project;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.tools.ant.DirectoryScanner;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java

@@ -9,9 +9,8 @@ package org.apache.tools.ant.taskdefs.optional.javacc;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java

@@ -8,9 +8,8 @@
 package org.apache.tools.ant.taskdefs.optional.javacc;
 
 import java.io.File;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java

@@ -340,7 +340,6 @@ public class JDependTask extends Task
         if( getDir() != null )
         {
             execute.setWorkingDirectory( getDir() );
-            execute.setAntRun( getProject() );
         }
 
         if( getOutputFile() != null )

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/jlink.java

@@ -13,9 +13,9 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Iterator;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.Iterator;
 import java.util.zip.CRC32;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs.optional.jsp;
 
 import java.io.File;
-import java.util.Date;
 import java.util.ArrayList;
+import java.util.Date;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
@@ -389,9 +389,9 @@ public class JspC extends MatchingTask
             CompilerAdapter adapter =
                 CompilerAdapterFactory.getCompiler( compiler, this );
             getLogger().info( "Compiling " + compileList.size() +
-                 " source file"
-                 + ( compileList.size() == 1 ? "" : "s" )
-                 + ( destDir != null ? " to " + destDir : "" ) );
+                              " source file"
+                              + ( compileList.size() == 1 ? "" : "s" )
+                              + ( destDir != null ? " to " + destDir : "" ) );
 
             // now we need to populate the compiler adapter
             adapter.setJspc( this );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java

@@ -8,9 +8,9 @@
 package org.apache.tools.ant.taskdefs.optional.jsp;//java imports
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultCompilerAdapter.java

@@ -7,8 +7,8 @@
  */
 package org.apache.tools.ant.taskdefs.optional.jsp.compilers;
 
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
 import org.apache.tools.ant.types.Commandline;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs.optional.junit;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java

@@ -12,11 +12,11 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URL;
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Properties;
 import java.util.Random;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.Project;
@@ -28,7 +28,7 @@ import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
 import org.apache.tools.ant.types.EnumeratedAttribute;
-import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.EnvironmentData;
 import org.apache.tools.ant.types.Path;
 
 /**
@@ -319,7 +319,7 @@ public class JUnitTask extends Task
      *
      * @param sysp The feature to be added to the Sysproperty attribute
      */
-    public void addSysproperty( Environment.Variable sysp )
+    public void addSysproperty( EnvironmentData.Variable sysp )
     {
         commandline.addSysproperty( sysp );
     }
@@ -675,7 +675,6 @@ public class JUnitTask extends Task
 
         Execute execute = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), watchdog );
         execute.setCommandline( cmd.getCommandline() );
-        execute.setAntRun( getProject() );
         if( dir != null )
         {
             execute.setWorkingDirectory( dir );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java

@@ -7,10 +7,10 @@
  */
 package org.apache.tools.ant.taskdefs.optional.junit;
 
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Properties;
-import java.util.ArrayList;
 import org.apache.tools.ant.Project;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java

@@ -17,20 +17,20 @@ import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Properties;
-import java.util.ArrayList;
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestListener;
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
+import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.StringUtils;
-import org.apache.avalon.framework.ExceptionUtil;
 
 /**
  * Simple Testrunner for JUnit that runs all tests of a testsuite. <p>
@@ -541,7 +541,7 @@ public class JUnitTestRunner implements TestListener
             for( int i = 0; i < formatters.size(); i++ )
             {
                 ( (TestListener)formatters.get( i ) ).addError( null,
-                                                                      exception );
+                                                                exception );
             }
             junitTest.setCounts( 1, 0, 1 );
             junitTest.setRunTime( 0 );

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java

@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.util.Iterator;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Properties;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java

@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.avalon.excalibur.io.FileUtil;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java

@@ -11,10 +11,10 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Random;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAuditStreamHandler.java

@@ -14,9 +14,9 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Iterator;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java

@@ -16,10 +16,10 @@ import java.io.OutputStreamWriter;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.EmptyStackException;
 import java.util.Iterator;
 import java.util.Stack;
-import java.util.ArrayList;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java

@@ -11,8 +11,8 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Random;
 import java.util.ArrayList;
+import java.util.Random;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java

@@ -20,8 +20,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Locale;
 import java.util.ArrayList;
+import java.util.Locale;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.FileScanner;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java

@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs.optional.net;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.Properties;
 import java.util.ArrayList;
+import java.util.Properties;
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
 import javax.mail.Message;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java

@@ -11,9 +11,9 @@ import com.oroinc.net.telnet.TelnetClient;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Iterator;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java

@@ -167,8 +167,6 @@ public abstract class P4Base extends org.apache.tools.ant.Task
 
             Execute exe = new Execute( handler, null );
 
-            exe.setAntRun( getProject() );
-
             exe.setCommandline( commandline.getCommandline() );
 
             try

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java

@@ -17,9 +17,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Random;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.exec.Execute;
@@ -452,7 +452,6 @@ public class Pvcs extends org.apache.tools.ant.Task
         {
             Project aProj = getProject();
             Execute exe = new Execute( out );
-            exe.setAntRun( aProj );
             exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java

@@ -998,7 +998,7 @@ public class AntStarTeamCheckOut extends org.apache.tools.ant.Task
         if( getVerbose() && getFolderName() != null )
         {
             getLogger().info( "Found " + getProjectName() + delim + getViewName() +
-                 delim + getFolderName() + delim + "\n" );
+                              delim + getFolderName() + delim + "\n" );
         }
 
         // For performance reasons, it is important to pre-fetch all the

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java

@@ -11,8 +11,8 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Random;
 import java.util.ArrayList;
+import java.util.Random;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java

@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.Random;
 import java.util.ArrayList;
+import java.util.Random;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Triggers.java

@@ -7,8 +7,8 @@
  */
 package org.apache.tools.ant.taskdefs.optional.sitraka;
 
-import java.util.Hashtable;
 import java.util.ArrayList;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 
 /**

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java

@@ -9,10 +9,10 @@ package org.apache.tools.ant.taskdefs.optional.sitraka;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.NoSuchElementException;
-import java.util.ArrayList;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java

@@ -15,11 +15,11 @@ import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Iterator;
+import java.util.ArrayList;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs.optional.sound;
 
 import java.io.File;
-import java.util.Random;
 import java.util.ArrayList;
+import java.util.Random;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java

@@ -227,7 +227,6 @@ public abstract class MSVSS extends Task
                 exe.setEnvironment( newEnv );
             }
 
-            exe.setAntRun( getProject() );
             exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java

@@ -14,9 +14,8 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java

@@ -37,7 +37,7 @@ public class BUnzip2 extends Unpack
         if( source.lastModified() > dest.lastModified() )
         {
             getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
-                 + dest.getAbsolutePath() );
+                              + dest.getAbsolutePath() );
 
             FileOutputStream out = null;
             CBZip2InputStream zIn = null;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java

@@ -17,10 +17,9 @@ import java.security.DigestInputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java

@@ -11,9 +11,9 @@ import java.io.File;
 import java.io.IOException;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
+import org.apache.tools.ant.taskdefs.exec.Execute;
 import org.apache.tools.ant.types.FileSet;
 import org.apache.tools.ant.types.PatternSet;
-import org.apache.tools.ant.taskdefs.exec.Execute;
 
 /**
  * Chmod equivalent for unix-like environments.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java

@@ -8,9 +8,9 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.Iterator;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.DirectoryScanner;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java

@@ -9,8 +9,8 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Hashtable;
 import java.util.ArrayList;
+import java.util.Hashtable;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java

@@ -13,8 +13,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Date;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import org.apache.avalon.excalibur.io.FileUtil;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java

@@ -37,7 +37,7 @@ public class GUnzip extends Unpack
         if( source.lastModified() > dest.lastModified() )
         {
             getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
-                 + dest.getAbsolutePath() );
+                              + dest.getAbsolutePath() );
 
             FileOutputStream out = null;
             GZIPInputStream zIn = null;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java

@@ -7,13 +7,12 @@
  */
 package org.apache.tools.ant.taskdefs;
 
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.exec.ExecTask;
-import org.apache.tools.ant.types.Commandline;
 
 /**
  * Generates a key.

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java

@@ -271,7 +271,7 @@ public class Get extends Task
                 {
                     Date t = new Date( remoteTimestamp );
                     getLogger().info( "last modified = " + t.toString()
-                         + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) );
+                                      + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) );
                 }
                 if( remoteTimestamp != 0 )
                     touchFile( dest, remoteTimestamp );

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java

@@ -10,8 +10,8 @@ package org.apache.tools.ant.taskdefs;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.StringTokenizer;
 import java.util.ArrayList;
+import java.util.StringTokenizer;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Jar.java

@@ -17,8 +17,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.Reader;
-import java.util.Iterator;
 import java.util.Enumeration;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.FileScanner;
 import org.apache.tools.ant.Project;

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java

@@ -16,11 +16,11 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.exec.Execute;
-import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
 import org.apache.tools.ant.taskdefs.exec.LogStreamHandler;
+import org.apache.tools.ant.taskdefs.exec.PumpStreamHandler;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.CommandlineJava;
-import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.EnvironmentData;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;
 
@@ -166,7 +166,7 @@ public class Java extends Task
      *
      * @param sysp The feature to be added to the Sysproperty attribute
      */
-    public void addSysproperty( Environment.Variable sysp )
+    public void addSysproperty( EnvironmentData.Variable sysp )
     {
         cmdl.addSysproperty( sysp );
     }
@@ -385,8 +385,6 @@ public class Java extends Task
                 exe = new Execute( new PumpStreamHandler( fos ), null );
             }
 
-            exe.setAntRun( getProject() );
-
             if( dir == null )
             {
                 dir = getBaseDirectory();

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java

@@ -8,8 +8,8 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
-import java.util.Iterator;
 import java.util.ArrayList;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.DirectoryScanner;
@@ -774,9 +774,9 @@ public class Javac extends MatchingTask
             CompilerAdapter adapter = CompilerAdapterFactory.getCompiler(
                 compiler, this );
             getLogger().info( "Compiling " + compileList.length +
-                 " source file"
-                 + ( compileList.length == 1 ? "" : "s" )
-                 + ( destDir != null ? " to " + destDir : "" ) );
+                              " source file"
+                              + ( compileList.length == 1 ? "" : "s" )
+                              + ( destDir != null ? " to " + destDir : "" ) );
 
             // now we need to populate the compiler adapter
             adapter.setJavac( this );

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java

@@ -12,9 +12,9 @@ import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.StringTokenizer;
-import java.util.ArrayList;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.DirectoryScanner;
@@ -28,7 +28,6 @@ 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.Reference;
-import org.apache.tools.ant.util.FileUtils;
 
 /**
  * This task makes it easy to generate Javadoc documentation for a collection of
@@ -918,7 +917,6 @@ public class Javadoc extends Task
         JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO );
         JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN );
         Execute exe = new Execute( new PumpStreamHandler( out, err ) );
-        exe.setAntRun( getProject() );
 
         /*
          * No reason to change the working directory as all filenames and

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java

@@ -18,10 +18,10 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import java.util.Hashtable;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
 import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.types.EnumeratedAttribute;
@@ -735,15 +735,15 @@ public class Manifest extends Task
             if( attribute.getName().equalsIgnoreCase( ATTRIBUTE_NAME ) )
             {
                 warnings.add( "\"" + ATTRIBUTE_NAME + "\" attributes should not occur in the " +
-                                     "main section and must be the first element in all " +
-                                     "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
+                              "main section and must be the first element in all " +
+                              "other sections: \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
                 return attribute.getValue();
             }
 
             if( attribute.getName().toLowerCase().startsWith( ATTRIBUTE_FROM.toLowerCase() ) )
             {
                 warnings.add( "Manifest attributes should not start with \"" +
-                                     ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
+                              ATTRIBUTE_FROM + "\" in \"" + attribute.getName() + ": " + attribute.getValue() + "\"" );
             }
             else
             {

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Recorder.java

@@ -143,7 +143,7 @@ public class Recorder extends Task
             throw new TaskException( "No filename specified" );
 
         log( "setting a recorder for name " + filename,
-                          Project.MSG_DEBUG );
+             Project.MSG_DEBUG );
 
         // get the recorder entry
         RecorderEntry recorder = getRecorder( filename, getProject() );