diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/AntClassLoader.java b/proposal/myrmidon/src/main/org/apache/tools/ant/AntClassLoader.java
index 6880707e9..80ef2fadc 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -128,7 +128,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      *      value of ${build.sysclasspath}
      */
     public AntClassLoader( Project project, Path classpath )
-    throws TaskException
+        throws TaskException
     {
         parent = AntClassLoader.class.getClassLoader();
         this.project = project;
@@ -163,7 +163,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      */
     public AntClassLoader( ClassLoader parent, Project project, Path classpath,
                            boolean parentFirst )
-    throws TaskException
+        throws TaskException
     {
         this( project, classpath );
         if( parent != null )
@@ -184,7 +184,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      *      be consulted before trying to load the a class through this loader.
      */
     public AntClassLoader( Project project, Path classpath, boolean parentFirst )
-    throws TaskException
+        throws TaskException
     {
         this( null, project, classpath, parentFirst );
     }
@@ -539,7 +539,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      * Reset the current thread's context loader to its original value
      */
     public void resetThreadContextLoader()
-    throws TaskException
+        throws TaskException
     {
         if( isContextLoaderSaved &&
             getContextClassLoader != null && setContextClassLoader != null )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java
index feef6ff96..1e89804b1 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildEvent.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.util.EventObject;
 
 public class BuildEvent extends EventObject
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildListener.java b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildListener.java
index f6055badb..46998da6a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildListener.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildListener.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.util.EventListener;
 
 /**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildLogger.java b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildLogger.java
index 9e3879d14..add7d7dfd 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/BuildLogger.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/BuildLogger.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.PrintStream;
 
 /**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java b/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java
index eb578b54e..f14ca2ab9 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java
@@ -6,9 +6,8 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import org.apache.tools.ant.util.StringUtils;
 
 /**
@@ -36,14 +35,14 @@ public class DefaultLogger implements BuildLogger
         if( minutes > 0 )
         {
             return Long.toString( minutes ) + " minute"
-                 + ( minutes == 1 ? " " : "s " )
-                 + Long.toString( seconds % 60 ) + " second"
-                 + ( seconds % 60 == 1 ? "" : "s" );
+                + ( minutes == 1 ? " " : "s " )
+                + Long.toString( seconds % 60 ) + " second"
+                + ( seconds % 60 == 1 ? "" : "s" );
         }
         else
         {
             return Long.toString( seconds ) + " second"
-                 + ( seconds % 60 == 1 ? "" : "s" );
+                + ( seconds % 60 == 1 ? "" : "s" );
         }
 
     }
@@ -137,7 +136,7 @@ public class DefaultLogger implements BuildLogger
         }
         message.append( StringUtils.LINE_SEP );
         message.append( "Total time: "
-             + formatTime( System.currentTimeMillis() - startTime ) );
+                        + formatTime( System.currentTimeMillis() - startTime ) );
 
         String msg = message.toString();
         if( error == null )
@@ -193,7 +192,9 @@ public class DefaultLogger implements BuildLogger
         }
     }
 
-    public void targetFinished( BuildEvent event ) { }
+    public void targetFinished( BuildEvent event )
+    {
+    }
 
     public void targetStarted( BuildEvent event )
     {
@@ -205,9 +206,13 @@ public class DefaultLogger implements BuildLogger
         }
     }
 
-    public void taskFinished( BuildEvent event ) { }
+    public void taskFinished( BuildEvent event )
+    {
+    }
 
-    public void taskStarted( BuildEvent event ) { }
+    public void taskStarted( BuildEvent event )
+    {
+    }
 
     /**
      * Empty implementation which allows subclasses to receive the same output
@@ -215,6 +220,8 @@ public class DefaultLogger implements BuildLogger
      *
      * @param message Description of Parameter
      */
-    protected void log( String message ) { }
+    protected void log( String message )
+    {
+    }
 
 }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/DemuxOutputStream.java b/proposal/myrmidon/src/main/org/apache/tools/ant/DemuxOutputStream.java
index ef0e5472f..58c7b5a7f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/DemuxOutputStream.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/DemuxOutputStream.java
@@ -6,12 +6,12 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Hashtable;
 
-
 /**
  * Logs content written by a thread and forwards the buffers onto the project
  * object which will forward the content to the appropriate task
@@ -24,7 +24,7 @@ public class DemuxOutputStream extends OutputStream
     private final static int MAX_SIZE = 1024;
 
     private Hashtable buffers = new Hashtable();
-//    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+    //    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
     private boolean skip = false;
     private boolean isErrorStream;
     private Project project;
@@ -76,7 +76,7 @@ public class DemuxOutputStream extends OutputStream
     public void write( int cc )
         throws IOException
     {
-        final byte c = ( byte )cc;
+        final byte c = (byte)cc;
         if( ( c == '\n' ) || ( c == '\r' ) )
         {
             if( !skip )
@@ -96,7 +96,6 @@ public class DemuxOutputStream extends OutputStream
         skip = ( c == '\r' );
     }
 
-
     /**
      * Converts the buffer to a string and sends it to <code>processLine</code>
      */
@@ -110,7 +109,7 @@ public class DemuxOutputStream extends OutputStream
     private ByteArrayOutputStream getBuffer()
     {
         Thread current = Thread.currentThread();
-        ByteArrayOutputStream buffer = ( ByteArrayOutputStream )buffers.get( current );
+        ByteArrayOutputStream buffer = (ByteArrayOutputStream)buffers.get( current );
         if( buffer == null )
         {
             buffer = new ByteArrayOutputStream();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/IntrospectionHelper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/IntrospectionHelper.java
index c904a133d..aa4f96286 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/IntrospectionHelper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/IntrospectionHelper.java
@@ -765,7 +765,7 @@ public class IntrospectionHelper implements BuildListener
                     {
                         final File file =
                             FileUtils.newFileUtils().resolveFile( p.getBaseDir(), value );
-                        m.invoke( parent, new File[]{ file } );
+                        m.invoke( parent, new File[]{file} );
                     }
 
                 };
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/PathTokenizer.java b/proposal/myrmidon/src/main/org/apache/tools/ant/PathTokenizer.java
index c66d94a07..ffa19db59 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/PathTokenizer.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/PathTokenizer.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.File;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
@@ -66,8 +67,8 @@ public class PathTokenizer
         }
 
         if( token.length() == 1 && Character.isLetter( token.charAt( 0 ) )
-             && dosStyleFilesystem
-             && tokenizer.hasMoreTokens() )
+            && dosStyleFilesystem
+            && tokenizer.hasMoreTokens() )
         {
             // we are on a dos style system so this path could be a drive
             // spec. We look at the next token
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
index 9e55dc561..9efcc0482 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -184,7 +184,7 @@ public class ProjectHelper
                 if( endName < 0 )
                 {
                     throw new TaskException( "Syntax error in property: "
-                                              + value );
+                                             + value );
                 }
                 String propertyName = value.substring( pos + 2, endName );
                 fragments.addElement( null );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java b/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java
index e55ad54c9..c6e596db3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/RuntimeConfigurable.java
@@ -6,12 +6,13 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Vector;
+import org.apache.myrmidon.api.TaskException;
 import org.xml.sax.AttributeList;
 import org.xml.sax.helpers.AttributeListImpl;
-import org.apache.myrmidon.api.TaskException;
 
 /**
  * Wrapper class that holds the attributes of a Task (or elements nested below
@@ -95,7 +96,6 @@ public class RuntimeConfigurable
         addText( new String( buf, start, end ) );
     }
 
-
     /**
      * Configure the wrapped element and all children.
      *
@@ -121,10 +121,10 @@ public class RuntimeConfigurable
         Enumeration enum = children.elements();
         while( enum.hasMoreElements() )
         {
-            RuntimeConfigurable child = ( RuntimeConfigurable )enum.nextElement();
+            RuntimeConfigurable child = (RuntimeConfigurable)enum.nextElement();
             if( child.wrappedObject instanceof Task )
             {
-                Task childTask = ( Task )child.wrappedObject;
+                Task childTask = (Task)child.wrappedObject;
                 childTask.setRuntimeConfigurableWrapper( child );
                 childTask.maybeConfigure();
             }
@@ -154,7 +154,7 @@ public class RuntimeConfigurable
      */
     RuntimeConfigurable getChild( int index )
     {
-        return ( RuntimeConfigurable )children.elementAt( index );
+        return (RuntimeConfigurable)children.elementAt( index );
     }
 
 }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/Target.java b/proposal/myrmidon/src/main/org/apache/tools/ant/Target.java
index 38b0cac3e..332f9f272 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/Target.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Target.java
@@ -44,8 +44,8 @@ public class Target implements TaskContainer
                 if( token.equals( "" ) || token.equals( "," ) )
                 {
                     throw new TaskException( "Syntax Error: Depend attribute " +
-                                              "for target \"" + getName() +
-                                              "\" has an empty string for dependency." );
+                                             "for target \"" + getName() +
+                                             "\" has an empty string for dependency." );
                 }
 
                 addDependency( token );
@@ -58,8 +58,8 @@ public class Target implements TaskContainer
                     if( !tok.hasMoreTokens() || !token.equals( "," ) )
                     {
                         throw new TaskException( "Syntax Error: Depend attribute " +
-                                                  "for target \"" + getName() +
-                                                  "\" ends with a , character" );
+                                                 "for target \"" + getName() +
+                                                 "\" ends with a , character" );
                     }
                 }
             }
@@ -228,7 +228,7 @@ public class Target implements TaskContainer
     }
 
     private boolean testUnlessCondition()
-    throws TaskException
+        throws TaskException
     {
         if( "".equals( unlessCondition ) )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java b/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java
index d0c6d3c8d..7a08963ea 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java
@@ -7,9 +7,7 @@
  */
 package org.apache.tools.ant;
 
-import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
 
 public abstract class Task
     extends ProjectComponent
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
index 4cc0b1a97..f803b1b73 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
@@ -6,11 +6,10 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import org.apache.myrmidon.api.TaskException;
 
-
 /**
  * Use introspection to "adapt" an arbitrary Bean ( not extending Task, but with
  * similar patterns).
@@ -34,7 +33,7 @@ public class TaskAdapter extends Task
      * @param project Description of Parameter
      */
     public static void checkTaskClass( final Class taskClass, final Project project )
-    throws TaskException
+        throws TaskException
     {
         // don't have to check for interface, since then
         // taskClass would be abstract too.
@@ -101,7 +100,7 @@ public class TaskAdapter extends Task
         catch( Exception ex )
         {
             log( "Error setting project in " + proxy.getClass(),
-                Project.MSG_ERR );
+                 Project.MSG_ERR );
             throw new BuildException( "Error", ex );
         }
 
@@ -109,7 +108,7 @@ public class TaskAdapter extends Task
         try
         {
             Class c = proxy.getClass();
-            executeM = c.getMethod( "execute", new Class[0] );
+            executeM = c.getMethod( "execute", new Class[ 0 ] );
             if( executeM == null )
             {
                 log( "No public execute() in " + proxy.getClass(), Project.MSG_ERR );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
index de7d75ec8..6acc70a13 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -51,11 +51,13 @@ public class Available
     }
 
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         createClasspath().append( classpath );
     }
 
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -66,6 +68,7 @@ public class Available
     }
 
     public void setFilepath( Path filepath )
+        throws TaskException
     {
         createFilepath().append( filepath );
     }
@@ -91,6 +94,7 @@ public class Available
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -100,6 +104,7 @@ public class Available
     }
 
     public Path createFilepath()
+        throws TaskException
     {
         if( this.filepath == null )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
index b33901acd..93ce5feb4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
@@ -32,6 +32,7 @@ public class BUnzip2 extends Unpack
     }
 
     protected void extract()
+        throws TaskException
     {
         if( source.lastModified() > dest.lastModified() )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BZip2.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BZip2.java
index 8a06764c1..a4605544a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BZip2.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BZip2.java
@@ -20,9 +20,11 @@ import org.apache.tools.bzip2.CBZip2OutputStream;
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  */
 
-public class BZip2 extends Pack
+public class BZip2
+    extends Pack
 {
     protected void pack()
+        throws TaskException
     {
         CBZip2OutputStream zOut = null;
         try
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java
index 54713ad34..ed83c4e67 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java
@@ -294,6 +294,7 @@ public class Copy extends Task
 
     protected void buildMap( File fromDir, File toDir, String[] names,
                              FileNameMapper mapper, Hashtable map )
+        throws TaskException
     {
 
         String[] toCopy = null;
@@ -413,6 +414,7 @@ public class Copy extends Task
      * @param dirs Description of Parameter
      */
     protected void scan( File fromDir, File toDir, String[] files, String[] dirs )
+        throws TaskException
     {
         FileNameMapper mapper = null;
         if( mapperElement != null )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java
index 939b01b5a..b48e7c2df 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java
@@ -73,6 +73,7 @@ public class Delete extends MatchingTask
      * @param excludes the string containing the exclude patterns
      */
     public void setExcludes( String excludes )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setExcludes( excludes );
@@ -85,6 +86,7 @@ public class Delete extends MatchingTask
      *      patterns from.
      */
     public void setExcludesfile( File excludesfile )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setExcludesfile( excludesfile );
@@ -127,6 +129,7 @@ public class Delete extends MatchingTask
      * @param includes the string containing the include patterns
      */
     public void setIncludes( String includes )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setIncludes( includes );
@@ -139,6 +142,7 @@ public class Delete extends MatchingTask
      *      patterns from.
      */
     public void setIncludesfile( File includesfile )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setIncludesfile( includesfile );
@@ -195,6 +199,7 @@ public class Delete extends MatchingTask
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createExclude()
+        throws TaskException
     {
         usedMatchingTask = true;
         return super.createExclude();
@@ -206,6 +211,7 @@ public class Delete extends MatchingTask
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createInclude()
+        throws TaskException
     {
         usedMatchingTask = true;
         return super.createInclude();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index 1aac3b0c2..eefda48c5 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -229,7 +229,7 @@ public class ExecTask extends Task
      * @exception IOException Description of Exception
      */
     protected final void runExecute( Execute exe )
-        throws IOException
+        throws IOException, TaskException
     {
         int err = -1;// assume the worst
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Execute.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Execute.java
index 8b323717d..8849c864a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Execute.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Execute.java
@@ -179,6 +179,7 @@ public class Execute
      * @return The ProcEnvironment value
      */
     public static synchronized Vector getProcEnvironment()
+        throws TaskException
     {
         if( procEnvironment != null )
             return procEnvironment;
@@ -405,6 +406,7 @@ public class Execute
      * @return the environment used to create a subprocess
      */
     public String[] getEnvironment()
+        throws TaskException
     {
         if( env == null || newEnvironment )
             return env;
@@ -505,6 +507,7 @@ public class Execute
      * @return the patched environment
      */
     private String[] patchEnvironment()
+        throws TaskException
     {
         Vector osEnv = (Vector)getProcEnvironment().clone();
         for( int i = 0; i < env.length; i++ )
@@ -681,7 +684,7 @@ public class Execute
          * @exception IOException Description of Exception
          */
         public Process exec( Project project, String[] cmd, String[] env, File workingDir )
-            throws IOException
+            throws IOException, TaskException
         {
             try
             {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
index daa6903b3..84cff357b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteOn.java
@@ -305,6 +305,7 @@ public class ExecuteOn extends ExecTask
      * @return The Dirs value
      */
     protected String[] getDirs( File baseDir, DirectoryScanner ds )
+        throws TaskException
     {
         if( mapper != null )
         {
@@ -327,6 +328,7 @@ public class ExecuteOn extends ExecTask
      * @return The Files value
      */
     protected String[] getFiles( File baseDir, DirectoryScanner ds )
+        throws TaskException
     {
         if( mapper != null )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
index bcd2aa6eb..f739437e5 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
@@ -32,6 +32,7 @@ public class GUnzip extends Unpack
     }
 
     protected void extract()
+        throws TaskException
     {
         if( source.lastModified() > dest.lastModified() )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GZip.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GZip.java
index 40fd8c279..ae3b8c75f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GZip.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GZip.java
@@ -20,10 +20,11 @@ import org.apache.myrmidon.api.TaskException;
  * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  */
-
-public class GZip extends Pack
+public class GZip
+    extends Pack
 {
     protected void pack()
+        throws TaskException
     {
         GZIPOutputStream zOut = null;
         try
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
index 4a3691a20..accda3713 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -49,6 +49,7 @@ public class GenerateKey extends Task
     }
 
     public void setDname( final String dname )
+        throws TaskException
     {
         if( null != expandedDname )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
index b8cd75ea0..24418bcb5 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -849,6 +849,7 @@ public class Javac extends MatchingTask
      * @param files Description of Parameter
      */
     protected void scanDir( File srcDir, File destDir, String files[] )
+        throws TaskException
     {
         GlobPatternMapper m = new GlobPatternMapper();
         m.setFrom( "*.java" );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java
index 42d371b7c..5941e300d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/LogStreamHandler.java
@@ -16,9 +16,9 @@ import org.apache.tools.ant.Task;
  *
  * @author thomas.haas@softwired-inc.com
  */
-public class LogStreamHandler extends PumpStreamHandler
+public class LogStreamHandler
+    extends PumpStreamHandler
 {
-
     /**
      * Creates a new instance of this class.
      *
@@ -33,6 +33,7 @@ public class LogStreamHandler extends PumpStreamHandler
     }
 
     public void stop()
+        throws TaskException
     {
         super.stop();
         try
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
index 19fc3110b..2795b2188 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Manifest.java
@@ -361,6 +361,7 @@ public class Manifest extends Task
         catch( IOException e )
         {
             throw new TaskException( "Failed to write " + manifestFile
+
             e );
         }
         finally
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
index 6ba88ca64..cc758cee3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -50,6 +50,7 @@ public abstract class MatchingTask extends Task
      * @param excludes the string containing the exclude patterns
      */
     public void setExcludes( String excludes )
+        throws TaskException
     {
         fileset.setExcludes( excludes );
     }
@@ -61,6 +62,7 @@ public abstract class MatchingTask extends Task
      *      patterns from.
      */
     public void setExcludesfile( File excludesfile )
+        throws TaskException
     {
         fileset.setExcludesfile( excludesfile );
     }
@@ -72,6 +74,7 @@ public abstract class MatchingTask extends Task
      * @param includes the string containing the include patterns
      */
     public void setIncludes( String includes )
+        throws TaskException
     {
         fileset.setIncludes( includes );
     }
@@ -83,6 +86,7 @@ public abstract class MatchingTask extends Task
      *      patterns from.
      */
     public void setIncludesfile( File includesfile )
+        throws TaskException
     {
         fileset.setIncludesfile( includesfile );
     }
@@ -93,6 +97,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createExclude()
+        throws TaskException
     {
         return fileset.createExclude();
     }
@@ -103,6 +108,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createExcludesFile()
+        throws TaskException
     {
         return fileset.createExcludesFile();
     }
@@ -113,6 +119,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createInclude()
+        throws TaskException
     {
         return fileset.createInclude();
     }
@@ -123,6 +130,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createIncludesFile()
+        throws TaskException
     {
         return fileset.createIncludesFile();
     }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Pack.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Pack.java
index 8bf3531f2..7064cec4a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Pack.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Pack.java
@@ -62,6 +62,7 @@ public abstract class Pack extends Task
     }
 
     private void validate()
+        throws TaskException
     {
         if( zipFile == null )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
index 31a7e773f..645da4af7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -225,6 +225,7 @@ public class Property extends Task
     }
 
     protected void loadEnvironment( String prefix )
+        throws TaskException
     {
         Properties props = new Properties();
         if( !prefix.endsWith( "." ) )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
index b8c13478b..7acbd9394 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
@@ -10,6 +10,7 @@ package org.apache.tools.ant.taskdefs;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import org.apache.myrmidon.api.TaskException;
 
 /**
  * Copies standard output and error of subprocesses to standard output and error
@@ -63,6 +64,7 @@ public class PumpStreamHandler implements ExecuteStreamHandler
     }
 
     public void stop()
+        throws TaskException
     {
         try
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 932bcdbc4..908512e1b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -607,6 +607,7 @@ public class Rmic extends MatchingTask
      */
     protected void scanDir( File baseDir, String files[],
                             FileNameMapper mapper )
+        throws TaskException
     {
 
         String[] newFiles = files;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
index f50c8fb7e..53c7b21f6 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tar.java
@@ -212,6 +212,7 @@ public class Tar extends MatchingTask
     }
 
     protected boolean archiveIsUpToDate( String[] files )
+        throws TaskException
     {
         SourceFileScanner sfs = new SourceFileScanner( this );
         MergingMapper mm = new MergingMapper();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
index 6dc8399a2..308fd768f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -161,6 +161,7 @@ public class UpToDate extends MatchingTask implements Condition
     }
 
     protected boolean scanDir( File srcDir, String files[] )
+        throws TaskException
     {
         SourceFileScanner sfs = new SourceFileScanner( this );
         FileNameMapper mapper = null;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java
index cd7432caf..3828bd206 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/FileList.java
@@ -52,6 +52,7 @@ public class FileList extends DataType
     }
 
     public void setFiles( String filenames )
+        throws TaskException
     {
         if( isReference() )
         {
@@ -88,6 +89,7 @@ public class FileList extends DataType
     }
 
     public File getDir( Project p )
+        throws TaskException
     {
         if( isReference() )
         {
@@ -103,6 +105,7 @@ public class FileList extends DataType
      * @return The Files value
      */
     public String[] getFiles( Project p )
+        throws TaskException
     {
         if( isReference() )
         {
@@ -132,6 +135,7 @@ public class FileList extends DataType
      * @return The Ref value
      */
     protected FileList getRef( Project p )
+        throws TaskException
     {
         if( !checked )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Substitution.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Substitution.java
index 726d9f8ff..cdf9187a7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/Substitution.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/Substitution.java
@@ -22,7 +22,8 @@ import org.apache.tools.ant.Project;
  *      mattinger@mindless.com</a>
  * @see org.apache.oro.text.regex.Perl5Substitition
  */
-public class Substitution extends DataType
+public class Substitution
+    extends DataType
 {
     public final static String DATA_TYPE_NAME = "substitition";
 
@@ -45,9 +46,12 @@ public class Substitution extends DataType
      * @return The Expression value
      */
     public String getExpression( Project p )
+        throws TaskException
     {
         if( isReference() )
+        {
             return getRef( p ).getExpression( p );
+        }
 
         return expression;
     }
@@ -60,6 +64,7 @@ public class Substitution extends DataType
      * @return The Ref value
      */
     public Substitution getRef( Project p )
+        throws TaskException
     {
         if( !checked )
         {
@@ -79,5 +84,4 @@ public class Substitution extends DataType
             return (Substitution)o;
         }
     }
-
 }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java
index fe0d01c1b..2a4f9405a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/types/ZipFileSet.java
@@ -27,9 +27,9 @@ import org.apache.tools.ant.Project;
  *
  * @author Don Ferguson <a href="mailto:don@bea.com">don@bea.com</a>
  */
-public class ZipFileSet extends FileSet
+public class ZipFileSet
+    extends FileSet
 {
-
     private File srcFile = null;
     private String prefix = "";
     private String fullpath = "";
@@ -84,6 +84,7 @@ public class ZipFileSet extends FileSet
      * @param srcFile The zip file from which to extract entries.
      */
     public void setSrc( File srcFile )
+        throws TaskException
     {
         if( hasDir )
         {
@@ -153,5 +154,4 @@ public class ZipFileSet extends FileSet
     {
         return srcFile;
     }
-
 }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java
index f0aa9447c..5da62b76f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/SourceFileScanner.java
@@ -9,6 +9,7 @@ package org.apache.tools.ant.util;
 
 import java.io.File;
 import java.util.Vector;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -53,6 +54,7 @@ public class SourceFileScanner
      */
     public String[] restrict( String[] files, File srcDir, File destDir,
                               FileNameMapper mapper )
+        throws TaskException
     {
 
         long now = ( new java.util.Date() ).getTime();
@@ -146,6 +148,7 @@ public class SourceFileScanner
      */
     public File[] restrictAsFiles( String[] files, File srcDir, File destDir,
                                    FileNameMapper mapper )
+        throws TaskException
     {
         String[] res = restrict( files, srcDir, destDir, mapper );
         File[] result = new File[ res.length ];
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/AntClassLoader.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/AntClassLoader.java
index 6880707e9..80ef2fadc 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/AntClassLoader.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/AntClassLoader.java
@@ -128,7 +128,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      *      value of ${build.sysclasspath}
      */
     public AntClassLoader( Project project, Path classpath )
-    throws TaskException
+        throws TaskException
     {
         parent = AntClassLoader.class.getClassLoader();
         this.project = project;
@@ -163,7 +163,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      */
     public AntClassLoader( ClassLoader parent, Project project, Path classpath,
                            boolean parentFirst )
-    throws TaskException
+        throws TaskException
     {
         this( project, classpath );
         if( parent != null )
@@ -184,7 +184,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      *      be consulted before trying to load the a class through this loader.
      */
     public AntClassLoader( Project project, Path classpath, boolean parentFirst )
-    throws TaskException
+        throws TaskException
     {
         this( null, project, classpath, parentFirst );
     }
@@ -539,7 +539,7 @@ public class AntClassLoader extends ClassLoader implements BuildListener
      * Reset the current thread's context loader to its original value
      */
     public void resetThreadContextLoader()
-    throws TaskException
+        throws TaskException
     {
         if( isContextLoaderSaved &&
             getContextClassLoader != null && setContextClassLoader != null )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java
index feef6ff96..1e89804b1 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildEvent.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.util.EventObject;
 
 public class BuildEvent extends EventObject
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildListener.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildListener.java
index f6055badb..46998da6a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildListener.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildListener.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.util.EventListener;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildLogger.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildLogger.java
index 9e3879d14..add7d7dfd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildLogger.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/BuildLogger.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.PrintStream;
 
 /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java
index eb578b54e..f14ca2ab9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java
@@ -6,9 +6,8 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import org.apache.tools.ant.util.StringUtils;
 
 /**
@@ -36,14 +35,14 @@ public class DefaultLogger implements BuildLogger
         if( minutes > 0 )
         {
             return Long.toString( minutes ) + " minute"
-                 + ( minutes == 1 ? " " : "s " )
-                 + Long.toString( seconds % 60 ) + " second"
-                 + ( seconds % 60 == 1 ? "" : "s" );
+                + ( minutes == 1 ? " " : "s " )
+                + Long.toString( seconds % 60 ) + " second"
+                + ( seconds % 60 == 1 ? "" : "s" );
         }
         else
         {
             return Long.toString( seconds ) + " second"
-                 + ( seconds % 60 == 1 ? "" : "s" );
+                + ( seconds % 60 == 1 ? "" : "s" );
         }
 
     }
@@ -137,7 +136,7 @@ public class DefaultLogger implements BuildLogger
         }
         message.append( StringUtils.LINE_SEP );
         message.append( "Total time: "
-             + formatTime( System.currentTimeMillis() - startTime ) );
+                        + formatTime( System.currentTimeMillis() - startTime ) );
 
         String msg = message.toString();
         if( error == null )
@@ -193,7 +192,9 @@ public class DefaultLogger implements BuildLogger
         }
     }
 
-    public void targetFinished( BuildEvent event ) { }
+    public void targetFinished( BuildEvent event )
+    {
+    }
 
     public void targetStarted( BuildEvent event )
     {
@@ -205,9 +206,13 @@ public class DefaultLogger implements BuildLogger
         }
     }
 
-    public void taskFinished( BuildEvent event ) { }
+    public void taskFinished( BuildEvent event )
+    {
+    }
 
-    public void taskStarted( BuildEvent event ) { }
+    public void taskStarted( BuildEvent event )
+    {
+    }
 
     /**
      * Empty implementation which allows subclasses to receive the same output
@@ -215,6 +220,8 @@ public class DefaultLogger implements BuildLogger
      *
      * @param message Description of Parameter
      */
-    protected void log( String message ) { }
+    protected void log( String message )
+    {
+    }
 
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/DemuxOutputStream.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/DemuxOutputStream.java
index ef0e5472f..58c7b5a7f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/DemuxOutputStream.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/DemuxOutputStream.java
@@ -6,12 +6,12 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Hashtable;
 
-
 /**
  * Logs content written by a thread and forwards the buffers onto the project
  * object which will forward the content to the appropriate task
@@ -24,7 +24,7 @@ public class DemuxOutputStream extends OutputStream
     private final static int MAX_SIZE = 1024;
 
     private Hashtable buffers = new Hashtable();
-//    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+    //    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
     private boolean skip = false;
     private boolean isErrorStream;
     private Project project;
@@ -76,7 +76,7 @@ public class DemuxOutputStream extends OutputStream
     public void write( int cc )
         throws IOException
     {
-        final byte c = ( byte )cc;
+        final byte c = (byte)cc;
         if( ( c == '\n' ) || ( c == '\r' ) )
         {
             if( !skip )
@@ -96,7 +96,6 @@ public class DemuxOutputStream extends OutputStream
         skip = ( c == '\r' );
     }
 
-
     /**
      * Converts the buffer to a string and sends it to <code>processLine</code>
      */
@@ -110,7 +109,7 @@ public class DemuxOutputStream extends OutputStream
     private ByteArrayOutputStream getBuffer()
     {
         Thread current = Thread.currentThread();
-        ByteArrayOutputStream buffer = ( ByteArrayOutputStream )buffers.get( current );
+        ByteArrayOutputStream buffer = (ByteArrayOutputStream)buffers.get( current );
         if( buffer == null )
         {
             buffer = new ByteArrayOutputStream();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/IntrospectionHelper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/IntrospectionHelper.java
index c904a133d..aa4f96286 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/IntrospectionHelper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/IntrospectionHelper.java
@@ -765,7 +765,7 @@ public class IntrospectionHelper implements BuildListener
                     {
                         final File file =
                             FileUtils.newFileUtils().resolveFile( p.getBaseDir(), value );
-                        m.invoke( parent, new File[]{ file } );
+                        m.invoke( parent, new File[]{file} );
                     }
 
                 };
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/PathTokenizer.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/PathTokenizer.java
index c66d94a07..ffa19db59 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/PathTokenizer.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/PathTokenizer.java
@@ -6,6 +6,7 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.io.File;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
@@ -66,8 +67,8 @@ public class PathTokenizer
         }
 
         if( token.length() == 1 && Character.isLetter( token.charAt( 0 ) )
-             && dosStyleFilesystem
-             && tokenizer.hasMoreTokens() )
+            && dosStyleFilesystem
+            && tokenizer.hasMoreTokens() )
         {
             // we are on a dos style system so this path could be a drive
             // spec. We look at the next token
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
index 9e55dc561..9efcc0482 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
@@ -184,7 +184,7 @@ public class ProjectHelper
                 if( endName < 0 )
                 {
                     throw new TaskException( "Syntax error in property: "
-                                              + value );
+                                             + value );
                 }
                 String propertyName = value.substring( pos + 2, endName );
                 fragments.addElement( null );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java
index e55ad54c9..c6e596db3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/RuntimeConfigurable.java
@@ -6,12 +6,13 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Vector;
+import org.apache.myrmidon.api.TaskException;
 import org.xml.sax.AttributeList;
 import org.xml.sax.helpers.AttributeListImpl;
-import org.apache.myrmidon.api.TaskException;
 
 /**
  * Wrapper class that holds the attributes of a Task (or elements nested below
@@ -95,7 +96,6 @@ public class RuntimeConfigurable
         addText( new String( buf, start, end ) );
     }
 
-
     /**
      * Configure the wrapped element and all children.
      *
@@ -121,10 +121,10 @@ public class RuntimeConfigurable
         Enumeration enum = children.elements();
         while( enum.hasMoreElements() )
         {
-            RuntimeConfigurable child = ( RuntimeConfigurable )enum.nextElement();
+            RuntimeConfigurable child = (RuntimeConfigurable)enum.nextElement();
             if( child.wrappedObject instanceof Task )
             {
-                Task childTask = ( Task )child.wrappedObject;
+                Task childTask = (Task)child.wrappedObject;
                 childTask.setRuntimeConfigurableWrapper( child );
                 childTask.maybeConfigure();
             }
@@ -154,7 +154,7 @@ public class RuntimeConfigurable
      */
     RuntimeConfigurable getChild( int index )
     {
-        return ( RuntimeConfigurable )children.elementAt( index );
+        return (RuntimeConfigurable)children.elementAt( index );
     }
 
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/Target.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/Target.java
index 38b0cac3e..332f9f272 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Target.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Target.java
@@ -44,8 +44,8 @@ public class Target implements TaskContainer
                 if( token.equals( "" ) || token.equals( "," ) )
                 {
                     throw new TaskException( "Syntax Error: Depend attribute " +
-                                              "for target \"" + getName() +
-                                              "\" has an empty string for dependency." );
+                                             "for target \"" + getName() +
+                                             "\" has an empty string for dependency." );
                 }
 
                 addDependency( token );
@@ -58,8 +58,8 @@ public class Target implements TaskContainer
                     if( !tok.hasMoreTokens() || !token.equals( "," ) )
                     {
                         throw new TaskException( "Syntax Error: Depend attribute " +
-                                                  "for target \"" + getName() +
-                                                  "\" ends with a , character" );
+                                                 "for target \"" + getName() +
+                                                 "\" ends with a , character" );
                     }
                 }
             }
@@ -228,7 +228,7 @@ public class Target implements TaskContainer
     }
 
     private boolean testUnlessCondition()
-    throws TaskException
+        throws TaskException
     {
         if( "".equals( unlessCondition ) )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java
index d0c6d3c8d..7a08963ea 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Task.java
@@ -7,9 +7,7 @@
  */
 package org.apache.tools.ant;
 
-import java.io.File;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.tools.ant.util.FileUtils;
 
 public abstract class Task
     extends ProjectComponent
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java
index 4cc0b1a97..f803b1b73 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java
@@ -6,11 +6,10 @@
  * the LICENSE file.
  */
 package org.apache.tools.ant;
+
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import org.apache.myrmidon.api.TaskException;
 
-
 /**
  * Use introspection to "adapt" an arbitrary Bean ( not extending Task, but with
  * similar patterns).
@@ -34,7 +33,7 @@ public class TaskAdapter extends Task
      * @param project Description of Parameter
      */
     public static void checkTaskClass( final Class taskClass, final Project project )
-    throws TaskException
+        throws TaskException
     {
         // don't have to check for interface, since then
         // taskClass would be abstract too.
@@ -101,7 +100,7 @@ public class TaskAdapter extends Task
         catch( Exception ex )
         {
             log( "Error setting project in " + proxy.getClass(),
-                Project.MSG_ERR );
+                 Project.MSG_ERR );
             throw new BuildException( "Error", ex );
         }
 
@@ -109,7 +108,7 @@ public class TaskAdapter extends Task
         try
         {
             Class c = proxy.getClass();
-            executeM = c.getMethod( "execute", new Class[0] );
+            executeM = c.getMethod( "execute", new Class[ 0 ] );
             if( executeM == null )
             {
                 log( "No public execute() in " + proxy.getClass(), Project.MSG_ERR );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
index de7d75ec8..6acc70a13 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
@@ -51,11 +51,13 @@ public class Available
     }
 
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         createClasspath().append( classpath );
     }
 
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -66,6 +68,7 @@ public class Available
     }
 
     public void setFilepath( Path filepath )
+        throws TaskException
     {
         createFilepath().append( filepath );
     }
@@ -91,6 +94,7 @@ public class Available
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -100,6 +104,7 @@ public class Available
     }
 
     public Path createFilepath()
+        throws TaskException
     {
         if( this.filepath == null )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java
index b33901acd..93ce5feb4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BUnzip2.java
@@ -32,6 +32,7 @@ public class BUnzip2 extends Unpack
     }
 
     protected void extract()
+        throws TaskException
     {
         if( source.lastModified() > dest.lastModified() )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BZip2.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BZip2.java
index 8a06764c1..a4605544a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BZip2.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/BZip2.java
@@ -20,9 +20,11 @@ import org.apache.tools.bzip2.CBZip2OutputStream;
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  */
 
-public class BZip2 extends Pack
+public class BZip2
+    extends Pack
 {
     protected void pack()
+        throws TaskException
     {
         CBZip2OutputStream zOut = null;
         try
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Copy.java
index 54713ad34..ed83c4e67 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Copy.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Copy.java
@@ -294,6 +294,7 @@ public class Copy extends Task
 
     protected void buildMap( File fromDir, File toDir, String[] names,
                              FileNameMapper mapper, Hashtable map )
+        throws TaskException
     {
 
         String[] toCopy = null;
@@ -413,6 +414,7 @@ public class Copy extends Task
      * @param dirs Description of Parameter
      */
     protected void scan( File fromDir, File toDir, String[] files, String[] dirs )
+        throws TaskException
     {
         FileNameMapper mapper = null;
         if( mapperElement != null )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Delete.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Delete.java
index 939b01b5a..b48e7c2df 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Delete.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Delete.java
@@ -73,6 +73,7 @@ public class Delete extends MatchingTask
      * @param excludes the string containing the exclude patterns
      */
     public void setExcludes( String excludes )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setExcludes( excludes );
@@ -85,6 +86,7 @@ public class Delete extends MatchingTask
      *      patterns from.
      */
     public void setExcludesfile( File excludesfile )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setExcludesfile( excludesfile );
@@ -127,6 +129,7 @@ public class Delete extends MatchingTask
      * @param includes the string containing the include patterns
      */
     public void setIncludes( String includes )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setIncludes( includes );
@@ -139,6 +142,7 @@ public class Delete extends MatchingTask
      *      patterns from.
      */
     public void setIncludesfile( File includesfile )
+        throws TaskException
     {
         usedMatchingTask = true;
         super.setIncludesfile( includesfile );
@@ -195,6 +199,7 @@ public class Delete extends MatchingTask
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createExclude()
+        throws TaskException
     {
         usedMatchingTask = true;
         return super.createExclude();
@@ -206,6 +211,7 @@ public class Delete extends MatchingTask
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createInclude()
+        throws TaskException
     {
         usedMatchingTask = true;
         return super.createInclude();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java
index 1aac3b0c2..eefda48c5 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -229,7 +229,7 @@ public class ExecTask extends Task
      * @exception IOException Description of Exception
      */
     protected final void runExecute( Execute exe )
-        throws IOException
+        throws IOException, TaskException
     {
         int err = -1;// assume the worst
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Execute.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Execute.java
index 8b323717d..8849c864a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Execute.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Execute.java
@@ -179,6 +179,7 @@ public class Execute
      * @return The ProcEnvironment value
      */
     public static synchronized Vector getProcEnvironment()
+        throws TaskException
     {
         if( procEnvironment != null )
             return procEnvironment;
@@ -405,6 +406,7 @@ public class Execute
      * @return the environment used to create a subprocess
      */
     public String[] getEnvironment()
+        throws TaskException
     {
         if( env == null || newEnvironment )
             return env;
@@ -505,6 +507,7 @@ public class Execute
      * @return the patched environment
      */
     private String[] patchEnvironment()
+        throws TaskException
     {
         Vector osEnv = (Vector)getProcEnvironment().clone();
         for( int i = 0; i < env.length; i++ )
@@ -681,7 +684,7 @@ public class Execute
          * @exception IOException Description of Exception
          */
         public Process exec( Project project, String[] cmd, String[] env, File workingDir )
-            throws IOException
+            throws IOException, TaskException
         {
             try
             {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java
index daa6903b3..84cff357b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteOn.java
@@ -305,6 +305,7 @@ public class ExecuteOn extends ExecTask
      * @return The Dirs value
      */
     protected String[] getDirs( File baseDir, DirectoryScanner ds )
+        throws TaskException
     {
         if( mapper != null )
         {
@@ -327,6 +328,7 @@ public class ExecuteOn extends ExecTask
      * @return The Files value
      */
     protected String[] getFiles( File baseDir, DirectoryScanner ds )
+        throws TaskException
     {
         if( mapper != null )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java
index bcd2aa6eb..f739437e5 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GUnzip.java
@@ -32,6 +32,7 @@ public class GUnzip extends Unpack
     }
 
     protected void extract()
+        throws TaskException
     {
         if( source.lastModified() > dest.lastModified() )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GZip.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GZip.java
index 40fd8c279..ae3b8c75f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GZip.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GZip.java
@@ -20,10 +20,11 @@ import org.apache.myrmidon.api.TaskException;
  * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  */
-
-public class GZip extends Pack
+public class GZip
+    extends Pack
 {
     protected void pack()
+        throws TaskException
     {
         GZIPOutputStream zOut = null;
         try
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java
index 4a3691a20..accda3713 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/GenerateKey.java
@@ -49,6 +49,7 @@ public class GenerateKey extends Task
     }
 
     public void setDname( final String dname )
+        throws TaskException
     {
         if( null != expandedDname )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
index b8cd75ea0..24418bcb5 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
@@ -849,6 +849,7 @@ public class Javac extends MatchingTask
      * @param files Description of Parameter
      */
     protected void scanDir( File srcDir, File destDir, String files[] )
+        throws TaskException
     {
         GlobPatternMapper m = new GlobPatternMapper();
         m.setFrom( "*.java" );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/LogStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/LogStreamHandler.java
index 42d371b7c..5941e300d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/LogStreamHandler.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/LogStreamHandler.java
@@ -16,9 +16,9 @@ import org.apache.tools.ant.Task;
  *
  * @author thomas.haas@softwired-inc.com
  */
-public class LogStreamHandler extends PumpStreamHandler
+public class LogStreamHandler
+    extends PumpStreamHandler
 {
-
     /**
      * Creates a new instance of this class.
      *
@@ -33,6 +33,7 @@ public class LogStreamHandler extends PumpStreamHandler
     }
 
     public void stop()
+        throws TaskException
     {
         super.stop();
         try
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java
index 19fc3110b..2795b2188 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Manifest.java
@@ -361,6 +361,7 @@ public class Manifest extends Task
         catch( IOException e )
         {
             throw new TaskException( "Failed to write " + manifestFile
+
             e );
         }
         finally
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
index 6ba88ca64..cc758cee3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -50,6 +50,7 @@ public abstract class MatchingTask extends Task
      * @param excludes the string containing the exclude patterns
      */
     public void setExcludes( String excludes )
+        throws TaskException
     {
         fileset.setExcludes( excludes );
     }
@@ -61,6 +62,7 @@ public abstract class MatchingTask extends Task
      *      patterns from.
      */
     public void setExcludesfile( File excludesfile )
+        throws TaskException
     {
         fileset.setExcludesfile( excludesfile );
     }
@@ -72,6 +74,7 @@ public abstract class MatchingTask extends Task
      * @param includes the string containing the include patterns
      */
     public void setIncludes( String includes )
+        throws TaskException
     {
         fileset.setIncludes( includes );
     }
@@ -83,6 +86,7 @@ public abstract class MatchingTask extends Task
      *      patterns from.
      */
     public void setIncludesfile( File includesfile )
+        throws TaskException
     {
         fileset.setIncludesfile( includesfile );
     }
@@ -93,6 +97,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createExclude()
+        throws TaskException
     {
         return fileset.createExclude();
     }
@@ -103,6 +108,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createExcludesFile()
+        throws TaskException
     {
         return fileset.createExcludesFile();
     }
@@ -113,6 +119,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createInclude()
+        throws TaskException
     {
         return fileset.createInclude();
     }
@@ -123,6 +130,7 @@ public abstract class MatchingTask extends Task
      * @return Description of the Returned Value
      */
     public PatternSet.NameEntry createIncludesFile()
+        throws TaskException
     {
         return fileset.createIncludesFile();
     }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Pack.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Pack.java
index 8bf3531f2..7064cec4a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Pack.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Pack.java
@@ -62,6 +62,7 @@ public abstract class Pack extends Task
     }
 
     private void validate()
+        throws TaskException
     {
         if( zipFile == null )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
index 31a7e773f..645da4af7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
@@ -225,6 +225,7 @@ public class Property extends Task
     }
 
     protected void loadEnvironment( String prefix )
+        throws TaskException
     {
         Properties props = new Properties();
         if( !prefix.endsWith( "." ) )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PumpStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
index b8c13478b..7acbd9394 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PumpStreamHandler.java
@@ -10,6 +10,7 @@ package org.apache.tools.ant.taskdefs;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import org.apache.myrmidon.api.TaskException;
 
 /**
  * Copies standard output and error of subprocesses to standard output and error
@@ -63,6 +64,7 @@ public class PumpStreamHandler implements ExecuteStreamHandler
     }
 
     public void stop()
+        throws TaskException
     {
         try
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java
index 932bcdbc4..908512e1b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Rmic.java
@@ -607,6 +607,7 @@ public class Rmic extends MatchingTask
      */
     protected void scanDir( File baseDir, String files[],
                             FileNameMapper mapper )
+        throws TaskException
     {
 
         String[] newFiles = files;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java
index f50c8fb7e..53c7b21f6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tar.java
@@ -212,6 +212,7 @@ public class Tar extends MatchingTask
     }
 
     protected boolean archiveIsUpToDate( String[] files )
+        throws TaskException
     {
         SourceFileScanner sfs = new SourceFileScanner( this );
         MergingMapper mm = new MergingMapper();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
index 6dc8399a2..308fd768f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -161,6 +161,7 @@ public class UpToDate extends MatchingTask implements Condition
     }
 
     protected boolean scanDir( File srcDir, String files[] )
+        throws TaskException
     {
         SourceFileScanner sfs = new SourceFileScanner( this );
         FileNameMapper mapper = null;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java
index cd7432caf..3828bd206 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/FileList.java
@@ -52,6 +52,7 @@ public class FileList extends DataType
     }
 
     public void setFiles( String filenames )
+        throws TaskException
     {
         if( isReference() )
         {
@@ -88,6 +89,7 @@ public class FileList extends DataType
     }
 
     public File getDir( Project p )
+        throws TaskException
     {
         if( isReference() )
         {
@@ -103,6 +105,7 @@ public class FileList extends DataType
      * @return The Files value
      */
     public String[] getFiles( Project p )
+        throws TaskException
     {
         if( isReference() )
         {
@@ -132,6 +135,7 @@ public class FileList extends DataType
      * @return The Ref value
      */
     protected FileList getRef( Project p )
+        throws TaskException
     {
         if( !checked )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Substitution.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Substitution.java
index 726d9f8ff..cdf9187a7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Substitution.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/Substitution.java
@@ -22,7 +22,8 @@ import org.apache.tools.ant.Project;
  *      mattinger@mindless.com</a>
  * @see org.apache.oro.text.regex.Perl5Substitition
  */
-public class Substitution extends DataType
+public class Substitution
+    extends DataType
 {
     public final static String DATA_TYPE_NAME = "substitition";
 
@@ -45,9 +46,12 @@ public class Substitution extends DataType
      * @return The Expression value
      */
     public String getExpression( Project p )
+        throws TaskException
     {
         if( isReference() )
+        {
             return getRef( p ).getExpression( p );
+        }
 
         return expression;
     }
@@ -60,6 +64,7 @@ public class Substitution extends DataType
      * @return The Ref value
      */
     public Substitution getRef( Project p )
+        throws TaskException
     {
         if( !checked )
         {
@@ -79,5 +84,4 @@ public class Substitution extends DataType
             return (Substitution)o;
         }
     }
-
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java
index fe0d01c1b..2a4f9405a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/types/ZipFileSet.java
@@ -27,9 +27,9 @@ import org.apache.tools.ant.Project;
  *
  * @author Don Ferguson <a href="mailto:don@bea.com">don@bea.com</a>
  */
-public class ZipFileSet extends FileSet
+public class ZipFileSet
+    extends FileSet
 {
-
     private File srcFile = null;
     private String prefix = "";
     private String fullpath = "";
@@ -84,6 +84,7 @@ public class ZipFileSet extends FileSet
      * @param srcFile The zip file from which to extract entries.
      */
     public void setSrc( File srcFile )
+        throws TaskException
     {
         if( hasDir )
         {
@@ -153,5 +154,4 @@ public class ZipFileSet extends FileSet
     {
         return srcFile;
     }
-
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java
index f0aa9447c..5da62b76f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/SourceFileScanner.java
@@ -9,6 +9,7 @@ package org.apache.tools.ant.util;
 
 import java.io.File;
 import java.util.Vector;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.framework.Os;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Task;
@@ -53,6 +54,7 @@ public class SourceFileScanner
      */
     public String[] restrict( String[] files, File srcDir, File destDir,
                               FileNameMapper mapper )
+        throws TaskException
     {
 
         long now = ( new java.util.Date() ).getTime();
@@ -146,6 +148,7 @@ public class SourceFileScanner
      */
     public File[] restrictAsFiles( String[] files, File srcDir, File destDir,
                                    FileNameMapper mapper )
+        throws TaskException
     {
         String[] res = restrict( files, srcDir, destDir, mapper );
         File[] result = new File[ res.length ];