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 f14ca2ab9..95506ec3f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/DefaultLogger.java
@@ -165,7 +165,7 @@ public class DefaultLogger implements BuildLogger
             // Print out the name of the task if we're in one
             if( event.getTask() != null )
             {
-                String name = event.getTask().getTaskName();
+                String name = event.getTask().getName();
 
                 if( !emacsMode )
                 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
index 91669261a..2f121655c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/Project.java
@@ -842,9 +842,6 @@ public class Project
             task.setProject( this );
             task.setTaskType( taskType );
 
-            // set default value, can be changed by the user
-            task.setTaskName( taskType );
-
             String msg = "   +Task: " + taskType;
             log( msg, MSG_DEBUG );
             addCreatedTask( taskType, task );
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 9fc7594f1..16ce194b2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -1015,7 +1015,6 @@ public class ProjectHelper
                 task = new UnknownElement( tag );
                 task.setProject( project );
                 task.setTaskType( tag );
-                task.setTaskName( tag );
             }
 
             configureId( task, attrs );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java b/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
index 1b3dbbcd2..05dc0d8dc 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/UnknownElement.java
@@ -64,17 +64,6 @@ public class UnknownElement extends Task
         return null;
     }
 
-    /**
-     * Get the name to use in logging messages.
-     *
-     * @return the name to use in logging messages.
-     */
-    public String getTaskName()
-    {
-        return realThing == null || !( realThing instanceof Task ) ?
-            super.getTaskName() : ( (Task)realThing ).getTaskName();
-    }
-
     /**
      * Adds a child element to this element.
      *
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 df23fa553..0c6bab4bd 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
@@ -296,6 +296,7 @@ public class ExecuteOn extends ExecTask
      * @return The Commandline value
      */
     protected String[] getCommandline( String srcFile, File baseDir )
+        throws TaskException
     {
         return getCommandline( new String[]{srcFile}, new File[]{baseDir} );
     }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
index a8a24ae8b..6e398d251 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
@@ -46,7 +46,7 @@ public interface ExecuteStreamHandler
      * @exception IOException Description of Exception
      */
     void setProcessOutputStream( InputStream is )
-        throws IOException;
+        throws TaskException, IOException;
 
     /**
      * Start handling of the streams.
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
index b84062cb7..0740c0900 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -921,17 +921,18 @@ public class FixCRLF extends MatchingTask
             {
                 throw new NoSuchElementException( "OneLiner" );
             }
-            BufferLine tmpLine =
-                new BufferLine( line.toString(), eolStr.toString() );
+
             try
             {
+                BufferLine tmpLine =
+                    new BufferLine( line.toString(), eolStr.toString() );
                 nextLine();
+                return tmpLine;
             }
             catch( TaskException e )
             {
                 throw new NoSuchElementException();
             }
-            return tmpLine;
         }
 
         protected void nextLine()
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 accda3713..90171ddc7 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
@@ -251,7 +251,6 @@ public class GenerateKey extends Task
         final ExecTask cmd = (ExecTask)project.createTask( "exec" );
         cmd.setCommand( new Commandline( sb.toString() ) );
         cmd.setFailonerror( true );
-        cmd.setTaskName( getTaskName() );
         cmd.execute();
     }
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
index 38064db4c..7385eccc4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
@@ -304,7 +304,6 @@ public class Get extends Task
         {
             Touch touch = (Touch)project.createTask( "touch" );
             touch.setOwningTarget( target );
-            touch.setTaskName( getTaskName() );
             touch.setFile( file );
             touch.setMillis( timemillis );
             touch.touch();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index a1fb74ec8..cc2b7e5a0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -204,6 +204,7 @@ public class Javadoc extends Task
     }
 
     public void setDocletPath( Path src )
+        throws TaskException
     {
         if( doclet == null )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
index 6d93689fd..6a0fd03dd 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
@@ -151,7 +151,7 @@ public class RecorderEntry implements BuildLogger
         StringBuffer buf = new StringBuffer();
         if( event.getTask() != null )
         {
-            String name = "[" + event.getTask().getTaskName() + "]";
+            String name = "[" + event.getTask().getName() + "]";
             /**
              * @todo replace 12 with DefaultLogger.LEFT_COLUMN_SIZE
              */
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 bc55a828b..22bfedd22 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
@@ -110,6 +110,7 @@ public class Rmic extends MatchingTask
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( compileClasspath == null )
         {
@@ -127,6 +128,7 @@ public class Rmic extends MatchingTask
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -147,6 +149,7 @@ public class Rmic extends MatchingTask
      * @param extdirs The new Extdirs value
      */
     public void setExtdirs( Path extdirs )
+        throws TaskException
     {
         if( this.extdirs == null )
         {
@@ -493,6 +496,7 @@ public class Rmic extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( compileClasspath == null )
         {
@@ -507,6 +511,7 @@ public class Rmic extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createExtdirs()
+        throws TaskException
     {
         if( extdirs == null )
         {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
index b21068d41..ce78081ce 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
@@ -328,7 +328,6 @@ public class SignJar extends Task
 
         log( "Signing Jar : " + jarSource.getAbsolutePath() );
         cmd.setFailonerror( true );
-        cmd.setTaskName( getTaskName() );
         cmd.execute();
     }
 
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 0dd6816ae..e736f4fe2 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
@@ -33,9 +33,22 @@ import org.apache.tools.tar.TarOutputStream;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 
-public class Tar extends MatchingTask
+public class Tar
+    extends MatchingTask
 {
-    private TarLongFileMode longFileMode = new TarLongFileMode();
+    private TarLongFileMode longFileMode = createMode();
+
+    private TarLongFileMode createMode()
+    {
+        try
+        {
+            return new TarLongFileMode();
+        }
+        catch( TaskException e )
+        {
+            throw new IllegalStateException( e.getMessage() );
+        }
+    }
 
     Vector filesets = new Vector();
     Vector fileSetFiles = new Vector();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
index 34364ae10..2ed1c4ca7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
@@ -318,7 +318,6 @@ public class Cab extends MatchingTask
     {
         ExecTask exec = (ExecTask)project.createTask( "exec" );
         exec.setOwningTarget( this.getOwningTarget() );
-        exec.setTaskName( this.getTaskName() );
         exec.setDescription( this.getDescription() );
 
         return exec;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
index 50a881fb5..449a984d2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
@@ -765,7 +765,6 @@ public class IContract extends MatchingTask
 
             // Create a forked java process
             Java iContract = (Java)project.createTask( "java" );
-            iContract.setTaskName( getTaskName() );
             iContract.setFork( true );
             iContract.setClassname( "com.reliablesystems.iContract.Tool" );
             iContract.setClasspath( iContractClasspath );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
index 12320fe9b..2c916564a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
@@ -124,8 +124,8 @@ public abstract class Continuus extends Task
     }
 
     protected int run( Commandline cmd )
+        throws TaskException
     {
         return run( cmd, new LogStreamHandler( this, Project.MSG_VERBOSE, Project.MSG_WARN ) );
     }
-
 }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
index 46e42abec..f83bafd6c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
@@ -434,7 +434,6 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
             {
                 gentask.setClasspath( classpath );
             }
-            gentask.setTaskName( "generate client" );
             gentask.execute();
         }
         catch( Exception e )
@@ -491,7 +490,6 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
             args += " " + sourceJar.getPath();
 
             javaTask = (Java)getTask().getProject().createTask( "java" );
-            javaTask.setTaskName( "verify" );
             javaTask.setClassname( VERIFY );
             Commandline.Argument arguments = javaTask.createArg();
             arguments.setLine( args );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
index 0d54b678c..4758d839b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
@@ -120,7 +120,6 @@ public class DDCreator extends MatchingTask
         String systemClassPath = System.getProperty( "java.class.path" );
         String execClassPath = project.translatePath( systemClassPath + ":" + classpath );
         Java ddCreatorTask = (Java)project.createTask( "java" );
-        ddCreatorTask.setTaskName( getTaskName() );
         ddCreatorTask.setFork( true );
         ddCreatorTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper" );
         Commandline.Argument arguments = ddCreatorTask.createArg();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
index 43f44ff22..52dfbed03 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
@@ -167,7 +167,6 @@ public class Ejbc extends MatchingTask
         String[] files = ds.getIncludedFiles();
 
         Java helperTask = (Java)project.createTask( "java" );
-        helperTask.setTaskName( getTaskName() );
         helperTask.setFork( true );
         helperTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.EjbcHelper" );
         String args = "";
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
index 7fc44bf0e..a57035fdc 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
@@ -313,7 +313,6 @@ public class WLRun extends Task
         }
 
         Java weblogicServer = (Java)project.createTask( "java" );
-        weblogicServer.setTaskName( getTaskName() );
         weblogicServer.setFork( true );
         weblogicServer.setClassname( weblogicMainClass );
 
@@ -364,7 +363,6 @@ public class WLRun extends Task
         }
 
         Java weblogicServer = (Java)project.createTask( "java" );
-        weblogicServer.setTaskName( getTaskName() );
         weblogicServer.setFork( true );
         weblogicServer.setDir( weblogicSystemHome );
         weblogicServer.setClassname( weblogicMainClass );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index cacfb1640..46461af44 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -773,7 +773,6 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool
         try
         {
             javaTask = (Java)getTask().getProject().createTask( "java" );
-            javaTask.setTaskName( "ejbc" );
 
             if( getJvmDebugLevel() != null )
             {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index e234767c6..33a1d7877 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -981,8 +981,6 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool
 
 
                 // Set the Java class name
-
-                javaTask.setTaskName( "ejbdeploy" );
                 javaTask.setClassname( "com.ibm.etools.ejbdeploy.EJBDeploy" );
                 Commandline.Argument arguments = javaTask.createArg();
                 arguments.setLine( args );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
index 89a890346..ab5bf81f1 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
@@ -1765,7 +1765,7 @@ public class VAJAntToolGUI extends Frame
             {
                 String msg = "";
                 if( event.getTask() != null )
-                    msg = "[" + event.getTask().getTaskName() + "] ";
+                    msg = "[" + event.getTask().getName() + "] ";
                 getMessageTextArea().append( lineSeparator + msg + event.getMessage() );
             }
         }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
index 305008c69..bbe8365a6 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
@@ -174,7 +174,6 @@ public class WLJspc extends MatchingTask
         Java helperTask = (Java)project.createTask( "java" );
         helperTask.setFork( true );
         helperTask.setClassname( "weblogic.jspc" );
-        helperTask.setTaskName( getTaskName() );
         String[] args = new String[ 12 ];
 
         File jspFile = null;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java b/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java
index 0c1d2b8bd..d6c48662b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java
@@ -51,5 +51,6 @@ public interface FileNameMapper
      *      basedirectory.
      * @return Description of the Returned Value
      */
-    String[] mapFileName( String sourceFileName );
+    String[] mapFileName( String sourceFileName )
+        throws TaskException;
 }
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 f14ca2ab9..95506ec3f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/DefaultLogger.java
@@ -165,7 +165,7 @@ public class DefaultLogger implements BuildLogger
             // Print out the name of the task if we're in one
             if( event.getTask() != null )
             {
-                String name = event.getTask().getTaskName();
+                String name = event.getTask().getName();
 
                 if( !emacsMode )
                 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java
index 91669261a..2f121655c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/Project.java
@@ -842,9 +842,6 @@ public class Project
             task.setProject( this );
             task.setTaskType( taskType );
 
-            // set default value, can be changed by the user
-            task.setTaskName( taskType );
-
             String msg = "   +Task: " + taskType;
             log( msg, MSG_DEBUG );
             addCreatedTask( taskType, task );
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 9fc7594f1..16ce194b2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectHelper.java
@@ -1015,7 +1015,6 @@ public class ProjectHelper
                 task = new UnknownElement( tag );
                 task.setProject( project );
                 task.setTaskType( tag );
-                task.setTaskName( tag );
             }
 
             configureId( task, attrs );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java
index 1b3dbbcd2..05dc0d8dc 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/UnknownElement.java
@@ -64,17 +64,6 @@ public class UnknownElement extends Task
         return null;
     }
 
-    /**
-     * Get the name to use in logging messages.
-     *
-     * @return the name to use in logging messages.
-     */
-    public String getTaskName()
-    {
-        return realThing == null || !( realThing instanceof Task ) ?
-            super.getTaskName() : ( (Task)realThing ).getTaskName();
-    }
-
     /**
      * Adds a child element to this element.
      *
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 df23fa553..0c6bab4bd 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
@@ -296,6 +296,7 @@ public class ExecuteOn extends ExecTask
      * @return The Commandline value
      */
     protected String[] getCommandline( String srcFile, File baseDir )
+        throws TaskException
     {
         return getCommandline( new String[]{srcFile}, new File[]{baseDir} );
     }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
index a8a24ae8b..6e398d251 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
@@ -46,7 +46,7 @@ public interface ExecuteStreamHandler
      * @exception IOException Description of Exception
      */
     void setProcessOutputStream( InputStream is )
-        throws IOException;
+        throws TaskException, IOException;
 
     /**
      * Start handling of the streams.
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java
index b84062cb7..0740c0900 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/FixCRLF.java
@@ -921,17 +921,18 @@ public class FixCRLF extends MatchingTask
             {
                 throw new NoSuchElementException( "OneLiner" );
             }
-            BufferLine tmpLine =
-                new BufferLine( line.toString(), eolStr.toString() );
+
             try
             {
+                BufferLine tmpLine =
+                    new BufferLine( line.toString(), eolStr.toString() );
                 nextLine();
+                return tmpLine;
             }
             catch( TaskException e )
             {
                 throw new NoSuchElementException();
             }
-            return tmpLine;
         }
 
         protected void nextLine()
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 accda3713..90171ddc7 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
@@ -251,7 +251,6 @@ public class GenerateKey extends Task
         final ExecTask cmd = (ExecTask)project.createTask( "exec" );
         cmd.setCommand( new Commandline( sb.toString() ) );
         cmd.setFailonerror( true );
-        cmd.setTaskName( getTaskName() );
         cmd.execute();
     }
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
index 38064db4c..7385eccc4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Get.java
@@ -304,7 +304,6 @@ public class Get extends Task
         {
             Touch touch = (Touch)project.createTask( "touch" );
             touch.setOwningTarget( target );
-            touch.setTaskName( getTaskName() );
             touch.setFile( file );
             touch.setMillis( timemillis );
             touch.touch();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java
index a1fb74ec8..cc2b7e5a0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -204,6 +204,7 @@ public class Javadoc extends Task
     }
 
     public void setDocletPath( Path src )
+        throws TaskException
     {
         if( doclet == null )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java
index 6d93689fd..6a0fd03dd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/RecorderEntry.java
@@ -151,7 +151,7 @@ public class RecorderEntry implements BuildLogger
         StringBuffer buf = new StringBuffer();
         if( event.getTask() != null )
         {
-            String name = "[" + event.getTask().getTaskName() + "]";
+            String name = "[" + event.getTask().getName() + "]";
             /**
              * @todo replace 12 with DefaultLogger.LEFT_COLUMN_SIZE
              */
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 bc55a828b..22bfedd22 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
@@ -110,6 +110,7 @@ public class Rmic extends MatchingTask
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( compileClasspath == null )
         {
@@ -127,6 +128,7 @@ public class Rmic extends MatchingTask
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -147,6 +149,7 @@ public class Rmic extends MatchingTask
      * @param extdirs The new Extdirs value
      */
     public void setExtdirs( Path extdirs )
+        throws TaskException
     {
         if( this.extdirs == null )
         {
@@ -493,6 +496,7 @@ public class Rmic extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( compileClasspath == null )
         {
@@ -507,6 +511,7 @@ public class Rmic extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createExtdirs()
+        throws TaskException
     {
         if( extdirs == null )
         {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java
index b21068d41..ce78081ce 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SignJar.java
@@ -328,7 +328,6 @@ public class SignJar extends Task
 
         log( "Signing Jar : " + jarSource.getAbsolutePath() );
         cmd.setFailonerror( true );
-        cmd.setTaskName( getTaskName() );
         cmd.execute();
     }
 
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 0dd6816ae..e736f4fe2 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
@@ -33,9 +33,22 @@ import org.apache.tools.tar.TarOutputStream;
  * @author <a href="mailto:umagesh@apache.org">Magesh Umasankar</a>
  */
 
-public class Tar extends MatchingTask
+public class Tar
+    extends MatchingTask
 {
-    private TarLongFileMode longFileMode = new TarLongFileMode();
+    private TarLongFileMode longFileMode = createMode();
+
+    private TarLongFileMode createMode()
+    {
+        try
+        {
+            return new TarLongFileMode();
+        }
+        catch( TaskException e )
+        {
+            throw new IllegalStateException( e.getMessage() );
+        }
+    }
 
     Vector filesets = new Vector();
     Vector fileSetFiles = new Vector();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
index 34364ae10..2ed1c4ca7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Cab.java
@@ -318,7 +318,6 @@ public class Cab extends MatchingTask
     {
         ExecTask exec = (ExecTask)project.createTask( "exec" );
         exec.setOwningTarget( this.getOwningTarget() );
-        exec.setTaskName( this.getTaskName() );
         exec.setDescription( this.getDescription() );
 
         return exec;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
index 50a881fb5..449a984d2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/IContract.java
@@ -765,7 +765,6 @@ public class IContract extends MatchingTask
 
             // Create a forked java process
             Java iContract = (Java)project.createTask( "java" );
-            iContract.setTaskName( getTaskName() );
             iContract.setFork( true );
             iContract.setClassname( "com.reliablesystems.iContract.Tool" );
             iContract.setClasspath( iContractClasspath );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
index 12320fe9b..2c916564a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
@@ -124,8 +124,8 @@ public abstract class Continuus extends Task
     }
 
     protected int run( Commandline cmd )
+        throws TaskException
     {
         return run( cmd, new LogStreamHandler( this, Project.MSG_VERBOSE, Project.MSG_WARN ) );
     }
-
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
index 46e42abec..f83bafd6c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
@@ -434,7 +434,6 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
             {
                 gentask.setClasspath( classpath );
             }
-            gentask.setTaskName( "generate client" );
             gentask.execute();
         }
         catch( Exception e )
@@ -491,7 +490,6 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
             args += " " + sourceJar.getPath();
 
             javaTask = (Java)getTask().getProject().createTask( "java" );
-            javaTask.setTaskName( "verify" );
             javaTask.setClassname( VERIFY );
             Commandline.Argument arguments = javaTask.createArg();
             arguments.setLine( args );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
index 0d54b678c..4758d839b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
@@ -120,7 +120,6 @@ public class DDCreator extends MatchingTask
         String systemClassPath = System.getProperty( "java.class.path" );
         String execClassPath = project.translatePath( systemClassPath + ":" + classpath );
         Java ddCreatorTask = (Java)project.createTask( "java" );
-        ddCreatorTask.setTaskName( getTaskName() );
         ddCreatorTask.setFork( true );
         ddCreatorTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper" );
         Commandline.Argument arguments = ddCreatorTask.createArg();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
index 43f44ff22..52dfbed03 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
@@ -167,7 +167,6 @@ public class Ejbc extends MatchingTask
         String[] files = ds.getIncludedFiles();
 
         Java helperTask = (Java)project.createTask( "java" );
-        helperTask.setTaskName( getTaskName() );
         helperTask.setFork( true );
         helperTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.EjbcHelper" );
         String args = "";
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
index 7fc44bf0e..a57035fdc 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
@@ -313,7 +313,6 @@ public class WLRun extends Task
         }
 
         Java weblogicServer = (Java)project.createTask( "java" );
-        weblogicServer.setTaskName( getTaskName() );
         weblogicServer.setFork( true );
         weblogicServer.setClassname( weblogicMainClass );
 
@@ -364,7 +363,6 @@ public class WLRun extends Task
         }
 
         Java weblogicServer = (Java)project.createTask( "java" );
-        weblogicServer.setTaskName( getTaskName() );
         weblogicServer.setFork( true );
         weblogicServer.setDir( weblogicSystemHome );
         weblogicServer.setClassname( weblogicMainClass );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
index cacfb1640..46461af44 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
@@ -773,7 +773,6 @@ public class WeblogicDeploymentTool extends GenericDeploymentTool
         try
         {
             javaTask = (Java)getTask().getProject().createTask( "java" );
-            javaTask.setTaskName( "ejbc" );
 
             if( getJvmDebugLevel() != null )
             {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
index e234767c6..33a1d7877 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
@@ -981,8 +981,6 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool
 
 
                 // Set the Java class name
-
-                javaTask.setTaskName( "ejbdeploy" );
                 javaTask.setClassname( "com.ibm.etools.ejbdeploy.EJBDeploy" );
                 Commandline.Argument arguments = javaTask.createArg();
                 arguments.setLine( args );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
index 89a890346..ab5bf81f1 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
@@ -1765,7 +1765,7 @@ public class VAJAntToolGUI extends Frame
             {
                 String msg = "";
                 if( event.getTask() != null )
-                    msg = "[" + event.getTask().getTaskName() + "] ";
+                    msg = "[" + event.getTask().getName() + "] ";
                 getMessageTextArea().append( lineSeparator + msg + event.getMessage() );
             }
         }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
index 305008c69..bbe8365a6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
@@ -174,7 +174,6 @@ public class WLJspc extends MatchingTask
         Java helperTask = (Java)project.createTask( "java" );
         helperTask.setFork( true );
         helperTask.setClassname( "weblogic.jspc" );
-        helperTask.setTaskName( getTaskName() );
         String[] args = new String[ 12 ];
 
         File jspFile = null;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java
index 0c1d2b8bd..d6c48662b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java
@@ -51,5 +51,6 @@ public interface FileNameMapper
      *      basedirectory.
      * @return Description of the Returned Value
      */
-    String[] mapFileName( String sourceFileName );
+    String[] mapFileName( String sourceFileName )
+        throws TaskException;
 }