BuildException -> TaskException

39 errors to go
39 errors to go
hey ho we're merry now for theres
39 errors to go


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

proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java

@@ -46,6 +46,12 @@ public abstract class ProjectComponent
         return project;
     }
 
+    public void execute()
+        throws TaskException
+    {
+        //HACK: NOOP execute - should be deleted in the future!
+    }
+
     protected File resolveFile( final String name )
         throws TaskException
     {

proposal/myrmidon/src/main/org/apache/tools/ant/TaskContainer.java

@@ -7,6 +7,8 @@
  */
 package org.apache.tools.ant;
 
+import org.apache.myrmidon.api.TaskException;
+
 /**
  * Interface for objects which can contain tasks <p>
  *
@@ -23,6 +25,7 @@ public interface TaskContainer
      *
      * @param task the task to be added to this container
      */
-    void addTask( Task task );
+    void addTask( Task task )
+        throws TaskException;
 }
 

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

@@ -32,6 +32,7 @@ public class Chmod extends ExecuteOn
     private boolean havePerm = false;
 
     public Chmod()
+        throws TaskException
     {
         super.setExecutable( "chmod" );
         super.setParallel( true );

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

@@ -34,6 +34,7 @@ public class Ear extends Jar
     }
 
     public void setAppxml( File descr )
+        throws TaskException
     {
         deploymentDescriptor = descr;
         if( !deploymentDescriptor.exists() )

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

@@ -106,6 +106,7 @@ public class Echo extends Task
      * @param msg The feature to be added to the Text attribute
      */
     public void addText( String msg )
+        throws TaskException
     {
         message += project.replaceProperties( msg );
     }

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

@@ -167,6 +167,7 @@ public class ExecuteOn extends ExecTask
      * @return The Commandline value
      */
     protected String[] getCommandline( String[] srcFiles, File[] baseDirs )
+        throws TaskException
     {
         Vector targets = new Vector();
         if( targetFilePos != null )

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

@@ -41,6 +41,7 @@ public class Exit extends Task
      * @param msg The feature to be added to the Text attribute
      */
     public void addText( String msg )
+        throws TaskException
     {
         message += project.replaceProperties( msg );
     }

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

@@ -151,6 +151,7 @@ public class Expand extends MatchingTask
      * This method is to be overridden by extending unarchival tasks.
      */
     protected void expandFile( FileUtils fileUtils, File srcF, File dir )
+        throws TaskException
     {
         ZipInputStream zis = null;
         try
@@ -192,7 +193,7 @@ public class Expand extends MatchingTask
                                 InputStream compressedInputStream,
                                 String entryName,
                                 Date entryDate, boolean isDirectory )
-        throws IOException
+        throws IOException, TaskException
     {
 
         if( patternsets != null && patternsets.size() > 0 )

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

@@ -455,6 +455,7 @@ public class FixCRLF extends MatchingTask
      */
     private void notInConstant( OneLiner.BufferLine bufline, int end,
                                 BufferedWriter outWriter )
+        throws TaskException
     {
         // N.B. both column and string index are zero-based
         // Process a string not part of a constant;
@@ -922,7 +923,14 @@ public class FixCRLF extends MatchingTask
             }
             BufferLine tmpLine =
                 new BufferLine( line.toString(), eolStr.toString() );
-            nextLine();
+            try
+            {
+                nextLine();
+            }
+            catch( TaskException e )
+            {
+                throw new NoSuchElementException();
+            }
             return tmpLine;
         }
 

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

@@ -831,17 +831,6 @@ public class Javac extends MatchingTask
             "javac1.4".equals( compiler );
     }
 
-    /**
-     * Recreate src
-     *
-     * @return a nested src element.
-     */
-    protected Path recreateSrc()
-    {
-        src = null;
-        return createSrc();
-    }
-
     /**
      * Clear the list of files to be compiled and copied..
      */

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

@@ -116,11 +116,13 @@ public class Javadoc extends Task
      * @param r The new BootClasspathRef value
      */
     public void setBootClasspathRef( Reference r )
+        throws TaskException
     {
         createBootclasspath().setRefid( r );
     }
 
     public void setBootclasspath( Path src )
+        throws TaskException
     {
         if( bootclasspath == null )
         {
@@ -145,6 +147,7 @@ public class Javadoc extends Task
     }
 
     public void setClasspath( Path src )
+        throws TaskException
     {
         if( classpath == null )
         {
@@ -162,6 +165,7 @@ public class Javadoc extends Task
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -209,6 +213,7 @@ public class Javadoc extends Task
     }
 
     public void setDocletPathRef( Reference r )
+        throws TaskException
     {
         if( doclet == null )
         {
@@ -445,6 +450,7 @@ public class Javadoc extends Task
     }
 
     public void setSourcepath( Path src )
+        throws TaskException
     {
         if( sourcePath == null )
         {
@@ -462,6 +468,7 @@ public class Javadoc extends Task
      * @param r The new SourcepathRef value
      */
     public void setSourcepathRef( Reference r )
+        throws TaskException
     {
         createSourcepath().setRefid( r );
     }
@@ -557,11 +564,13 @@ public class Javadoc extends Task
     }
 
     public void addSource( SourceFile sf )
+        throws TaskException
     {
         sourceFiles.addElement( sf );
     }
 
     public Path createBootclasspath()
+        throws TaskException
     {
         if( bootclasspath == null )
         {
@@ -571,6 +580,7 @@ public class Javadoc extends Task
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( classpath == null )
         {
@@ -600,6 +610,7 @@ public class Javadoc extends Task
     }
 
     public Path createSourcepath()
+        throws TaskException
     {
         if( sourcePath == null )
         {
@@ -956,6 +967,7 @@ public class Javadoc extends Task
      * @return Description of the Returned Value
      */
     protected String expand( String content )
+        throws TaskException
     {
         return project.replaceProperties( content );
     }
@@ -1242,6 +1254,7 @@ public class Javadoc extends Task
         }
 
         public void setPath( Path path )
+            throws TaskException
         {
             if( this.path == null )
             {
@@ -1259,6 +1272,7 @@ public class Javadoc extends Task
          * @param r The new PathRef value
          */
         public void setPathRef( Reference r )
+            throws TaskException
         {
             createPath().setRefid( r );
         }
@@ -1287,6 +1301,7 @@ public class Javadoc extends Task
         }
 
         public Path createPath()
+            throws TaskException
         {
             if( path == null )
             {

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

@@ -109,7 +109,7 @@ public class Manifest extends Task
      * @throws IOException if the manifest cannot be read from the reader.
      */
     public Manifest( Reader r )
-        throws ManifestException, IOException
+        throws ManifestException, TaskException, IOException
     {
         BufferedReader reader = new BufferedReader( r );
         // This should be the manifest version
@@ -239,7 +239,7 @@ public class Manifest extends Task
     }
 
     public void addConfiguredAttribute( Attribute attribute )
-        throws ManifestException
+        throws ManifestException, TaskException
     {
         mainSection.addConfiguredAttribute( attribute );
     }
@@ -417,7 +417,7 @@ public class Manifest extends Task
         {
             write( new PrintWriter( sw ) );
         }
-        catch( IOException e )
+        catch( Exception e )
         {
             return null;
         }
@@ -431,7 +431,7 @@ public class Manifest extends Task
      * @throws IOException if the manifest cannot be written
      */
     public void write( PrintWriter writer )
-        throws IOException
+        throws IOException, TaskException
     {
         writer.println( ATTRIBUTE_MANIFEST_VERSION + ": " + manifestVersion );
         String signatureVersion = mainSection.getAttributeValue( ATTRIBUTE_SIGNATURE_VERSION );
@@ -862,7 +862,7 @@ public class Manifest extends Task
          * @throws IOException if the section cannot be read from the reader.
          */
         public String read( BufferedReader reader )
-            throws ManifestException, IOException
+            throws ManifestException, IOException, TaskException
         {
             Attribute attribute = null;
             while( true )

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

@@ -47,6 +47,7 @@ public class Move extends Copy
      * @param d Description of Parameter
      */
     protected void deleteDir( File d )
+        throws TaskException
     {
         String[] list = d.list();
         if( list == null )
@@ -77,6 +78,7 @@ public class Move extends Copy
     //************************************************************************
 
     protected void doFileOperations()
+        throws TaskException
     {
         //Attempt complete directory renames, if any, first.
         if( completeDirMap.size() > 0 )

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

@@ -98,11 +98,13 @@ public class Parallel extends Task
                 {
                     firstException = t;
                 }
+                /*
                 if( t instanceof TaskException &&
                     firstLocation == Location.UNKNOWN_LOCATION )
                 {
                     firstLocation = ( (TaskException)t ).getLocation();
                 }
+                */
                 exceptionMessage.append( lSep );
                 exceptionMessage.append( t.getMessage() );
             }

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

@@ -68,6 +68,7 @@ public class Patch extends Task
      * @param file The new Patchfile value
      */
     public void setPatchfile( File file )
+        throws TaskException
     {
         if( !file.exists() )
         {

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

@@ -77,6 +77,7 @@ public class PathConvert extends Task
      * @param r The new Refid value
      */
     public void setRefid( Reference r )
+        throws TaskException
     {
         if( path != null )
             throw noChildrenAllowed();
@@ -90,8 +91,8 @@ public class PathConvert extends Task
      * @param target The new Targetos value
      */
     public void setTargetos( String target )
+        throws TaskException
     {
-
         targetOS = target.toLowerCase();
 
         if( !targetOS.equals( "windows" ) && !target.equals( "unix" ) &&
@@ -139,8 +140,8 @@ public class PathConvert extends Task
      * @return Description of the Returned Value
      */
     public Path createPath()
+        throws TaskException
     {
-
         if( isReference() )
             throw noChildrenAllowed();
 
@@ -159,7 +160,6 @@ public class PathConvert extends Task
     public void execute()
         throws TaskException
     {
-
         // If we are a reference, the create a Path from the reference
         if( isReference() )
         {
@@ -238,8 +238,8 @@ public class PathConvert extends Task
      * @return String Updated element
      */
     private String mapElement( String elem )
+        throws TaskException
     {
-
         int size = prefixMap.size();
 
         if( size != 0 )
@@ -365,6 +365,7 @@ public class PathConvert extends Task
          * @return String Updated path element after mapping
          */
         public String apply( String elem )
+            throws TaskException
         {
             if( from == null || to == null )
             {

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

@@ -54,6 +54,7 @@ public class Property extends Task
     }
 
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -66,6 +67,7 @@ public class Property extends Task
     }
 
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -136,6 +138,7 @@ public class Property extends Task
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -192,6 +195,7 @@ public class Property extends Task
     }
 
     protected void addProperties( Properties props )
+        throws TaskException
     {
         resolveAllProperties( props );
         Enumeration e = props.keys();

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

@@ -682,7 +682,6 @@ public class Rmic extends MatchingTask
             {
                 String msg = "Failed to copy " + oldFile + " to " +
                     newFile + " due to " + ioe.getMessage();
-                newFile + " due to " + ioe.getMessage();
                 throw new TaskException( msg, ioe );
             }
         }

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

@@ -171,6 +171,7 @@ public class SQLExec extends Task
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -188,6 +189,7 @@ public class SQLExec extends Task
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -364,6 +366,7 @@ public class SQLExec extends Task
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+    throws TaskException
     {
         if( this.classpath == null )
         {
@@ -739,7 +742,7 @@ public class SQLExec extends Task
     }
 
     protected void runStatements( Reader reader, PrintStream out )
-        throws SQLException, IOException
+        throws SQLException, IOException, TaskException
     {
         String sql = "";
         String line = "";
@@ -845,7 +848,7 @@ public class SQLExec extends Task
         }
 
         private void runTransaction( PrintStream out )
-            throws IOException, SQLException
+            throws IOException, SQLException, TaskException
         {
             if( tSqlCommand.length() != 0 )
             {

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

@@ -222,7 +222,7 @@ public class Tar extends MatchingTask
 
     protected void tarFile( File file, TarOutputStream tOut, String vPath,
                             TarFileSet tarFileSet )
-        throws IOException
+        throws IOException, TaskException
     {
         FileInputStream fIn = null;
 
@@ -341,6 +341,7 @@ public class Tar extends MatchingTask
          *      for the project.
          */
         public String[] getFiles( Project p )
+            throws TaskException
         {
             if( files == null )
             {
@@ -380,7 +381,6 @@ public class Tar extends MatchingTask
      */
     public static class TarLongFileMode extends EnumeratedAttribute
     {
-
         // permissable values for longfile attribute
         public final static String WARN = "warn";
         public final static String FAIL = "fail";
@@ -391,6 +391,7 @@ public class Tar extends MatchingTask
         private final String[] validModes = {WARN, FAIL, TRUNCATE, GNU, OMIT};
 
         public TarLongFileMode()
+            throws TaskException
         {
             super();
             setValue( WARN );

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

@@ -153,6 +153,7 @@ public class Tstamp extends Task
         }
 
         public void setLocale( String locale )
+            throws TaskException
         {
             StringTokenizer st = new StringTokenizer( locale, " \t\n\r\f," );
             try
@@ -207,6 +208,7 @@ public class Tstamp extends Task
         }
 
         public void execute( Project project, Date date, Location location )
+            throws TaskException
         {
             if( propertyName == null )
             {

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

@@ -26,6 +26,7 @@ public class Untar extends Expand
 {
 
     protected void expandFile( FileUtils fileUtils, File srcF, File dir )
+        throws TaskException
     {
         TarInputStream tis = null;
         try

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

@@ -107,6 +107,7 @@ public class UpToDate extends MatchingTask implements Condition
      * @return Description of the Returned Value
      */
     public boolean eval()
+        throws TaskException
     {
         if( sourceFileSets.size() == 0 )
         {

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

@@ -33,6 +33,7 @@ public class War extends Jar
     }
 
     public void setWebxml( File descr )
+        throws TaskException
     {
         deploymentDescriptor = descr;
         if( !deploymentDescriptor.exists() )

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

@@ -91,6 +91,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         createClasspath().append( classpath );
     }
@@ -102,6 +103,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }//-- setSourceDir
@@ -191,6 +193,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( classpath == null )
         {
@@ -279,6 +282,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
     }
 
     protected XSLTLiaison getLiaison()
+        throws TaskException
     {
         // if processor wasn't specified, see if TraX is available.  If not,
         // default it to xslp or xalan, depending on which is in the classpath

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

@@ -384,6 +384,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter
      * @return Description of the Returned Value
      */
     protected int executeExternalCompile( String[] args, int firstFileName )
+        throws TaskException
     {
         String[] commandArray = null;
         File tmpFile = null;

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

@@ -21,7 +21,9 @@ import org.apache.tools.ant.ProjectComponent;
  *
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  */
-public class Http extends ProjectComponent implements Condition
+public class Http
+    extends ProjectComponent
+    implements Condition
 {
     String spec = null;
 

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

@@ -18,7 +18,9 @@ import org.apache.tools.ant.ProjectComponent;
  *
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  */
-public class Socket extends ProjectComponent implements Condition
+public class Socket
+    extends ProjectComponent
+    implements Condition
 {
     String server = null;
     int port = 0;

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

@@ -100,6 +100,7 @@ public class Rpm extends Task
     }
 
     public void setSpecFile( String sf )
+        throws TaskException
     {
         if( ( sf == null ) || ( sf.trim().equals( "" ) ) )
         {

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

@@ -109,8 +109,8 @@ public class XMLValidateTask extends Task
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
-
         if( this.classpath == null )
         {
             this.classpath = classpath;
@@ -126,6 +126,7 @@ public class XMLValidateTask extends Task
      * @see #setClasspath
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -202,6 +203,7 @@ public class XMLValidateTask extends Task
      * @see #setClasspath
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -319,6 +321,7 @@ public class XMLValidateTask extends Task
      * parse the file
      */
     private void doValidate( File afile )
+        throws TaskException
     {
         try
         {

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

@@ -119,7 +119,7 @@ public class CCMCreateTask extends Continuus implements ExecuteStreamHandler
      * @exception IOException Description of Exception
      */
     public void setProcessOutputStream( InputStream is )
-        throws IOException
+        throws TaskException, IOException
     {
 
         String buffer = "";

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

@@ -107,6 +107,7 @@ public abstract class Continuus extends Task
     }
 
     protected int run( Commandline cmd, ExecuteStreamHandler handler )
+        throws TaskException
     {
         try
         {

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

@@ -13,6 +13,7 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;
+import java.io.IOException;
 
 /**
  * A base class for creating tasks for executing commands on ClearCase. <p>
@@ -103,6 +104,7 @@ public abstract class ClearCase extends Task
     }
 
     protected int run( Commandline cmd )
+        throws TaskException
     {
         try
         {
@@ -113,7 +115,7 @@ public abstract class ClearCase extends Task
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }
-        catch( java.io.IOException e )
+        catch( IOException e )
         {
             throw new TaskException( "Error", e );
         }

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

@@ -105,6 +105,7 @@ public class Depend extends MatchingTask
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( dependClasspath == null )
         {
@@ -122,6 +123,7 @@ public class Depend extends MatchingTask
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -178,6 +180,7 @@ public class Depend extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( dependClasspath == null )
         {
@@ -359,6 +362,7 @@ public class Depend extends MatchingTask
      * @return a vector containing the classes to analyse.
      */
     private Vector getClassFiles( Path classLocations )
+        throws TaskException
     {
         // break the classLocations into its components.
         String[] classLocationsList = classLocations.list();

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

@@ -280,6 +280,7 @@ public class CSharp
      */
 
     public CSharp()
+        throws TaskException
     {
         Clear();
         setIncludes( csc_file_pattern );
@@ -417,6 +418,7 @@ public class CSharp
      * @param path another path to append
      */
     public void setReferenceFiles( Path path )
+        throws TaskException
     {
         //demand create pathlist
         if( _referenceFiles == null )

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

@@ -119,6 +119,7 @@ public class Ilasm
      * constructor inits everything and set up the search pattern
      */
     public Ilasm()
+        throws TaskException
     {
         Clear();
         setIncludes( file_pattern );

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

@@ -76,6 +76,7 @@ public class NetCommand
      */
 
     public NetCommand( Task owner, String title, String program )
+        throws TaskException
     {
         _owner = owner;
         _title = title;
@@ -196,6 +197,7 @@ public class NetCommand
      * set up the command sequence..
      */
     protected void prepareExecutor()
+        throws TaskException
     {
         // default directory to the project's base directory
         File dir = _owner.getProject().getBaseDir();

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

@@ -55,6 +55,7 @@ public class BorlandGenerateClient extends Task
     Path classpath;
 
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -67,6 +68,7 @@ public class BorlandGenerateClient extends Task
     }
 
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -92,6 +94,7 @@ public class BorlandGenerateClient extends Task
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {

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

@@ -59,6 +59,7 @@ public class JlinkTask extends MatchingTask
      * @param addfiles The new Addfiles value
      */
     public void setAddfiles( Path addfiles )
+        throws TaskException
     {
         if( this.addfiles == null )
         {
@@ -86,6 +87,7 @@ public class JlinkTask extends MatchingTask
      * @param mergefiles The new Mergefiles value
      */
     public void setMergefiles( Path mergefiles )
+        throws TaskException
     {
         if( this.mergefiles == null )
         {
@@ -113,6 +115,7 @@ public class JlinkTask extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createAddfiles()
+        throws TaskException
     {
         if( this.addfiles == null )
         {
@@ -128,6 +131,7 @@ public class JlinkTask extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createMergefiles()
+        throws TaskException
     {
         if( this.mergefiles == null )
         {
@@ -179,11 +183,13 @@ public class JlinkTask extends MatchingTask
     }
 
     private boolean haveAddFiles()
+        throws TaskException
     {
         return haveEntries( addfiles );
     }
 
     private boolean haveEntries( Path p )
+        throws TaskException
     {
         if( p == null )
         {
@@ -197,9 +203,9 @@ public class JlinkTask extends MatchingTask
     }
 
     private boolean haveMergeFiles()
+        throws TaskException
     {
         return haveEntries( mergefiles );
     }
-
 }
 

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

@@ -101,6 +101,7 @@ public class JspC extends MatchingTask
      * @param cp The new Classpath value
      */
     public void setClasspath( Path cp )
+        throws TaskException
     {
         if( classpath == null )
             classpath = cp;
@@ -114,6 +115,7 @@ public class JspC extends MatchingTask
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -187,6 +189,7 @@ public class JspC extends MatchingTask
      * @param srcDir The new Srcdir value
      */
     public void setSrcdir( Path srcDir )
+        throws TaskException
     {
         if( src == null )
         {
@@ -309,6 +312,7 @@ public class JspC extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( classpath == null )
             classpath = new Path( project );

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

@@ -74,6 +74,7 @@ public class WLJspc extends MatchingTask
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( compileClasspath == null )
         {
@@ -92,7 +93,6 @@ public class WLJspc extends MatchingTask
      */
     public void setDest( File dirName )
     {
-
         destinationDirectory = dirName;
     }
 

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

@@ -319,7 +319,7 @@ public class Pvcs extends org.apache.tools.ant.Task
      *      build...
      */
     public void execute()
-        throws org.apache.tools.ant.TaskException
+        throws TaskException
     {
         Project aProj = getProject();
         int result = 0;
@@ -446,6 +446,7 @@ public class Pvcs extends org.apache.tools.ant.Task
     }
 
     protected int runCmd( Commandline cmd, ExecuteStreamHandler out )
+        throws TaskException
     {
         try
         {

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

@@ -200,6 +200,7 @@ public abstract class MSVSS extends Task
     }
 
     protected int run( Commandline cmd )
+        throws TaskException
     {
         try
         {

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

@@ -141,6 +141,7 @@ public class MSVSSHISTORY extends MSVSS
      * @param attr The new Style value
      */
     public void setStyle( BriefCodediffNofile attr )
+        throws TaskException
     {
         String option = attr.getValue();
         if( option.equals( "brief" ) )

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

@@ -10,6 +10,7 @@ package org.apache.tools.ant.taskdefs.rmic;
 import java.io.File;
 import java.util.Random;
 import java.util.Vector;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Rmic;
 import org.apache.tools.ant.types.Commandline;
@@ -51,6 +52,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return The Classpath value
      */
     public Path getClasspath()
+        throws TaskException
     {
         return getCompileClasspath();
     }
@@ -77,6 +79,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return Description of the Returned Value
      */
     protected Commandline setupRmicCommand()
+        throws TaskException
     {
         return setupRmicCommand( null );
     }
@@ -88,6 +91,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return Description of the Returned Value
      */
     protected Commandline setupRmicCommand( String[] options )
+        throws TaskException
     {
         Commandline cmd = new Commandline();
 
@@ -178,6 +182,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return The CompileClasspath value
      */
     protected Path getCompileClasspath()
+        throws TaskException
     {
         // add dest dir to classpath so that previously compiled and
         // untouched classes are on classpath

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

@@ -57,5 +57,6 @@ public interface RmicAdapter
      *
      * @return The Classpath value
      */
-    Path getClasspath();
+    Path getClasspath()
+        throws TaskException;
 }

proposal/myrmidon/src/main/org/apache/tools/ant/types/DataType.java

@@ -92,12 +92,6 @@ public abstract class DataType
         return ref != null;
     }
 
-    public void execute()
-        throws TaskException
-    {
-        //HACK: NOOP execute - should be deleted in the future!
-    }
-
     /**
      * Performs the check for circular references and returns the referenced
      * object.

proposal/myrmidon/src/main/org/apache/tools/ant/util/FileNameMapper.java

@@ -7,6 +7,8 @@
  */
 package org.apache.tools.ant.util;
 
+import org.apache.myrmidon.api.TaskException;
+
 /**
  * Interface to be used by SourceFileScanner. <p>
  *
@@ -27,7 +29,8 @@ public interface FileNameMapper
      *
      * @param from The new From value
      */
-    void setFrom( String from );
+    void setFrom( String from )
+        throws TaskException;
 
     /**
      * Sets the to part of the transformation rule.

proposal/myrmidon/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java

@@ -69,9 +69,9 @@ public class RegexpPatternMapper implements FileNameMapper
      * @return Description of the Returned Value
      */
     public String[] mapFileName( String sourceFileName )
+        throws TaskException
     {
-        if( reg == null || to == null
-            || !reg.matches( sourceFileName ) )
+        if( reg == null || to == null || !reg.matches( sourceFileName ) )
         {
             return null;
         }
@@ -86,6 +86,7 @@ public class RegexpPatternMapper implements FileNameMapper
      * @return Description of the Returned Value
      */
     protected String replaceReferences( String source )
+        throws TaskException
     {
         Vector v = reg.getGroups( source );
 

proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectComponent.java

@@ -46,6 +46,12 @@ public abstract class ProjectComponent
         return project;
     }
 
+    public void execute()
+        throws TaskException
+    {
+        //HACK: NOOP execute - should be deleted in the future!
+    }
+
     protected File resolveFile( final String name )
         throws TaskException
     {

proposal/myrmidon/src/todo/org/apache/tools/ant/TaskContainer.java

@@ -7,6 +7,8 @@
  */
 package org.apache.tools.ant;
 
+import org.apache.myrmidon.api.TaskException;
+
 /**
  * Interface for objects which can contain tasks <p>
  *
@@ -23,6 +25,7 @@ public interface TaskContainer
      *
      * @param task the task to be added to this container
      */
-    void addTask( Task task );
+    void addTask( Task task )
+        throws TaskException;
 }
 

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

@@ -32,6 +32,7 @@ public class Chmod extends ExecuteOn
     private boolean havePerm = false;
 
     public Chmod()
+        throws TaskException
     {
         super.setExecutable( "chmod" );
         super.setParallel( true );

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

@@ -34,6 +34,7 @@ public class Ear extends Jar
     }
 
     public void setAppxml( File descr )
+        throws TaskException
     {
         deploymentDescriptor = descr;
         if( !deploymentDescriptor.exists() )

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

@@ -106,6 +106,7 @@ public class Echo extends Task
      * @param msg The feature to be added to the Text attribute
      */
     public void addText( String msg )
+        throws TaskException
     {
         message += project.replaceProperties( msg );
     }

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

@@ -167,6 +167,7 @@ public class ExecuteOn extends ExecTask
      * @return The Commandline value
      */
     protected String[] getCommandline( String[] srcFiles, File[] baseDirs )
+        throws TaskException
     {
         Vector targets = new Vector();
         if( targetFilePos != null )

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

@@ -41,6 +41,7 @@ public class Exit extends Task
      * @param msg The feature to be added to the Text attribute
      */
     public void addText( String msg )
+        throws TaskException
     {
         message += project.replaceProperties( msg );
     }

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

@@ -151,6 +151,7 @@ public class Expand extends MatchingTask
      * This method is to be overridden by extending unarchival tasks.
      */
     protected void expandFile( FileUtils fileUtils, File srcF, File dir )
+        throws TaskException
     {
         ZipInputStream zis = null;
         try
@@ -192,7 +193,7 @@ public class Expand extends MatchingTask
                                 InputStream compressedInputStream,
                                 String entryName,
                                 Date entryDate, boolean isDirectory )
-        throws IOException
+        throws IOException, TaskException
     {
 
         if( patternsets != null && patternsets.size() > 0 )

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

@@ -455,6 +455,7 @@ public class FixCRLF extends MatchingTask
      */
     private void notInConstant( OneLiner.BufferLine bufline, int end,
                                 BufferedWriter outWriter )
+        throws TaskException
     {
         // N.B. both column and string index are zero-based
         // Process a string not part of a constant;
@@ -922,7 +923,14 @@ public class FixCRLF extends MatchingTask
             }
             BufferLine tmpLine =
                 new BufferLine( line.toString(), eolStr.toString() );
-            nextLine();
+            try
+            {
+                nextLine();
+            }
+            catch( TaskException e )
+            {
+                throw new NoSuchElementException();
+            }
             return tmpLine;
         }
 

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

@@ -831,17 +831,6 @@ public class Javac extends MatchingTask
             "javac1.4".equals( compiler );
     }
 
-    /**
-     * Recreate src
-     *
-     * @return a nested src element.
-     */
-    protected Path recreateSrc()
-    {
-        src = null;
-        return createSrc();
-    }
-
     /**
      * Clear the list of files to be compiled and copied..
      */

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

@@ -116,11 +116,13 @@ public class Javadoc extends Task
      * @param r The new BootClasspathRef value
      */
     public void setBootClasspathRef( Reference r )
+        throws TaskException
     {
         createBootclasspath().setRefid( r );
     }
 
     public void setBootclasspath( Path src )
+        throws TaskException
     {
         if( bootclasspath == null )
         {
@@ -145,6 +147,7 @@ public class Javadoc extends Task
     }
 
     public void setClasspath( Path src )
+        throws TaskException
     {
         if( classpath == null )
         {
@@ -162,6 +165,7 @@ public class Javadoc extends Task
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -209,6 +213,7 @@ public class Javadoc extends Task
     }
 
     public void setDocletPathRef( Reference r )
+        throws TaskException
     {
         if( doclet == null )
         {
@@ -445,6 +450,7 @@ public class Javadoc extends Task
     }
 
     public void setSourcepath( Path src )
+        throws TaskException
     {
         if( sourcePath == null )
         {
@@ -462,6 +468,7 @@ public class Javadoc extends Task
      * @param r The new SourcepathRef value
      */
     public void setSourcepathRef( Reference r )
+        throws TaskException
     {
         createSourcepath().setRefid( r );
     }
@@ -557,11 +564,13 @@ public class Javadoc extends Task
     }
 
     public void addSource( SourceFile sf )
+        throws TaskException
     {
         sourceFiles.addElement( sf );
     }
 
     public Path createBootclasspath()
+        throws TaskException
     {
         if( bootclasspath == null )
         {
@@ -571,6 +580,7 @@ public class Javadoc extends Task
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( classpath == null )
         {
@@ -600,6 +610,7 @@ public class Javadoc extends Task
     }
 
     public Path createSourcepath()
+        throws TaskException
     {
         if( sourcePath == null )
         {
@@ -956,6 +967,7 @@ public class Javadoc extends Task
      * @return Description of the Returned Value
      */
     protected String expand( String content )
+        throws TaskException
     {
         return project.replaceProperties( content );
     }
@@ -1242,6 +1254,7 @@ public class Javadoc extends Task
         }
 
         public void setPath( Path path )
+            throws TaskException
         {
             if( this.path == null )
             {
@@ -1259,6 +1272,7 @@ public class Javadoc extends Task
          * @param r The new PathRef value
          */
         public void setPathRef( Reference r )
+            throws TaskException
         {
             createPath().setRefid( r );
         }
@@ -1287,6 +1301,7 @@ public class Javadoc extends Task
         }
 
         public Path createPath()
+            throws TaskException
         {
             if( path == null )
             {

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

@@ -109,7 +109,7 @@ public class Manifest extends Task
      * @throws IOException if the manifest cannot be read from the reader.
      */
     public Manifest( Reader r )
-        throws ManifestException, IOException
+        throws ManifestException, TaskException, IOException
     {
         BufferedReader reader = new BufferedReader( r );
         // This should be the manifest version
@@ -239,7 +239,7 @@ public class Manifest extends Task
     }
 
     public void addConfiguredAttribute( Attribute attribute )
-        throws ManifestException
+        throws ManifestException, TaskException
     {
         mainSection.addConfiguredAttribute( attribute );
     }
@@ -417,7 +417,7 @@ public class Manifest extends Task
         {
             write( new PrintWriter( sw ) );
         }
-        catch( IOException e )
+        catch( Exception e )
         {
             return null;
         }
@@ -431,7 +431,7 @@ public class Manifest extends Task
      * @throws IOException if the manifest cannot be written
      */
     public void write( PrintWriter writer )
-        throws IOException
+        throws IOException, TaskException
     {
         writer.println( ATTRIBUTE_MANIFEST_VERSION + ": " + manifestVersion );
         String signatureVersion = mainSection.getAttributeValue( ATTRIBUTE_SIGNATURE_VERSION );
@@ -862,7 +862,7 @@ public class Manifest extends Task
          * @throws IOException if the section cannot be read from the reader.
          */
         public String read( BufferedReader reader )
-            throws ManifestException, IOException
+            throws ManifestException, IOException, TaskException
         {
             Attribute attribute = null;
             while( true )

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

@@ -47,6 +47,7 @@ public class Move extends Copy
      * @param d Description of Parameter
      */
     protected void deleteDir( File d )
+        throws TaskException
     {
         String[] list = d.list();
         if( list == null )
@@ -77,6 +78,7 @@ public class Move extends Copy
     //************************************************************************
 
     protected void doFileOperations()
+        throws TaskException
     {
         //Attempt complete directory renames, if any, first.
         if( completeDirMap.size() > 0 )

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

@@ -98,11 +98,13 @@ public class Parallel extends Task
                 {
                     firstException = t;
                 }
+                /*
                 if( t instanceof TaskException &&
                     firstLocation == Location.UNKNOWN_LOCATION )
                 {
                     firstLocation = ( (TaskException)t ).getLocation();
                 }
+                */
                 exceptionMessage.append( lSep );
                 exceptionMessage.append( t.getMessage() );
             }

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

@@ -68,6 +68,7 @@ public class Patch extends Task
      * @param file The new Patchfile value
      */
     public void setPatchfile( File file )
+        throws TaskException
     {
         if( !file.exists() )
         {

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

@@ -77,6 +77,7 @@ public class PathConvert extends Task
      * @param r The new Refid value
      */
     public void setRefid( Reference r )
+        throws TaskException
     {
         if( path != null )
             throw noChildrenAllowed();
@@ -90,8 +91,8 @@ public class PathConvert extends Task
      * @param target The new Targetos value
      */
     public void setTargetos( String target )
+        throws TaskException
     {
-
         targetOS = target.toLowerCase();
 
         if( !targetOS.equals( "windows" ) && !target.equals( "unix" ) &&
@@ -139,8 +140,8 @@ public class PathConvert extends Task
      * @return Description of the Returned Value
      */
     public Path createPath()
+        throws TaskException
     {
-
         if( isReference() )
             throw noChildrenAllowed();
 
@@ -159,7 +160,6 @@ public class PathConvert extends Task
     public void execute()
         throws TaskException
     {
-
         // If we are a reference, the create a Path from the reference
         if( isReference() )
         {
@@ -238,8 +238,8 @@ public class PathConvert extends Task
      * @return String Updated element
      */
     private String mapElement( String elem )
+        throws TaskException
     {
-
         int size = prefixMap.size();
 
         if( size != 0 )
@@ -365,6 +365,7 @@ public class PathConvert extends Task
          * @return String Updated path element after mapping
          */
         public String apply( String elem )
+            throws TaskException
         {
             if( from == null || to == null )
             {

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

@@ -54,6 +54,7 @@ public class Property extends Task
     }
 
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -66,6 +67,7 @@ public class Property extends Task
     }
 
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -136,6 +138,7 @@ public class Property extends Task
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -192,6 +195,7 @@ public class Property extends Task
     }
 
     protected void addProperties( Properties props )
+        throws TaskException
     {
         resolveAllProperties( props );
         Enumeration e = props.keys();

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

@@ -682,7 +682,6 @@ public class Rmic extends MatchingTask
             {
                 String msg = "Failed to copy " + oldFile + " to " +
                     newFile + " due to " + ioe.getMessage();
-                newFile + " due to " + ioe.getMessage();
                 throw new TaskException( msg, ioe );
             }
         }

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

@@ -171,6 +171,7 @@ public class SQLExec extends Task
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -188,6 +189,7 @@ public class SQLExec extends Task
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -364,6 +366,7 @@ public class SQLExec extends Task
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+    throws TaskException
     {
         if( this.classpath == null )
         {
@@ -739,7 +742,7 @@ public class SQLExec extends Task
     }
 
     protected void runStatements( Reader reader, PrintStream out )
-        throws SQLException, IOException
+        throws SQLException, IOException, TaskException
     {
         String sql = "";
         String line = "";
@@ -845,7 +848,7 @@ public class SQLExec extends Task
         }
 
         private void runTransaction( PrintStream out )
-            throws IOException, SQLException
+            throws IOException, SQLException, TaskException
         {
             if( tSqlCommand.length() != 0 )
             {

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

@@ -222,7 +222,7 @@ public class Tar extends MatchingTask
 
     protected void tarFile( File file, TarOutputStream tOut, String vPath,
                             TarFileSet tarFileSet )
-        throws IOException
+        throws IOException, TaskException
     {
         FileInputStream fIn = null;
 
@@ -341,6 +341,7 @@ public class Tar extends MatchingTask
          *      for the project.
          */
         public String[] getFiles( Project p )
+            throws TaskException
         {
             if( files == null )
             {
@@ -380,7 +381,6 @@ public class Tar extends MatchingTask
      */
     public static class TarLongFileMode extends EnumeratedAttribute
     {
-
         // permissable values for longfile attribute
         public final static String WARN = "warn";
         public final static String FAIL = "fail";
@@ -391,6 +391,7 @@ public class Tar extends MatchingTask
         private final String[] validModes = {WARN, FAIL, TRUNCATE, GNU, OMIT};
 
         public TarLongFileMode()
+            throws TaskException
         {
             super();
             setValue( WARN );

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

@@ -153,6 +153,7 @@ public class Tstamp extends Task
         }
 
         public void setLocale( String locale )
+            throws TaskException
         {
             StringTokenizer st = new StringTokenizer( locale, " \t\n\r\f," );
             try
@@ -207,6 +208,7 @@ public class Tstamp extends Task
         }
 
         public void execute( Project project, Date date, Location location )
+            throws TaskException
         {
             if( propertyName == null )
             {

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

@@ -26,6 +26,7 @@ public class Untar extends Expand
 {
 
     protected void expandFile( FileUtils fileUtils, File srcF, File dir )
+        throws TaskException
     {
         TarInputStream tis = null;
         try

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

@@ -107,6 +107,7 @@ public class UpToDate extends MatchingTask implements Condition
      * @return Description of the Returned Value
      */
     public boolean eval()
+        throws TaskException
     {
         if( sourceFileSets.size() == 0 )
         {

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

@@ -33,6 +33,7 @@ public class War extends Jar
     }
 
     public void setWebxml( File descr )
+        throws TaskException
     {
         deploymentDescriptor = descr;
         if( !deploymentDescriptor.exists() )

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

@@ -91,6 +91,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         createClasspath().append( classpath );
     }
@@ -102,6 +103,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }//-- setSourceDir
@@ -191,6 +193,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( classpath == null )
         {
@@ -279,6 +282,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
     }
 
     protected XSLTLiaison getLiaison()
+        throws TaskException
     {
         // if processor wasn't specified, see if TraX is available.  If not,
         // default it to xslp or xalan, depending on which is in the classpath

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

@@ -384,6 +384,7 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter
      * @return Description of the Returned Value
      */
     protected int executeExternalCompile( String[] args, int firstFileName )
+        throws TaskException
     {
         String[] commandArray = null;
         File tmpFile = null;

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

@@ -21,7 +21,9 @@ import org.apache.tools.ant.ProjectComponent;
  *
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  */
-public class Http extends ProjectComponent implements Condition
+public class Http
+    extends ProjectComponent
+    implements Condition
 {
     String spec = null;
 

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

@@ -18,7 +18,9 @@ import org.apache.tools.ant.ProjectComponent;
  *
  * @author <a href="mailto:denis@network365.com">Denis Hennessy</a>
  */
-public class Socket extends ProjectComponent implements Condition
+public class Socket
+    extends ProjectComponent
+    implements Condition
 {
     String server = null;
     int port = 0;

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

@@ -100,6 +100,7 @@ public class Rpm extends Task
     }
 
     public void setSpecFile( String sf )
+        throws TaskException
     {
         if( ( sf == null ) || ( sf.trim().equals( "" ) ) )
         {

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

@@ -109,8 +109,8 @@ public class XMLValidateTask extends Task
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
-
         if( this.classpath == null )
         {
             this.classpath = classpath;
@@ -126,6 +126,7 @@ public class XMLValidateTask extends Task
      * @see #setClasspath
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -202,6 +203,7 @@ public class XMLValidateTask extends Task
      * @see #setClasspath
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -319,6 +321,7 @@ public class XMLValidateTask extends Task
      * parse the file
      */
     private void doValidate( File afile )
+        throws TaskException
     {
         try
         {

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java

@@ -119,7 +119,7 @@ public class CCMCreateTask extends Continuus implements ExecuteStreamHandler
      * @exception IOException Description of Exception
      */
     public void setProcessOutputStream( InputStream is )
-        throws IOException
+        throws TaskException, IOException
     {
 
         String buffer = "";

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

@@ -107,6 +107,7 @@ public abstract class Continuus extends Task
     }
 
     protected int run( Commandline cmd, ExecuteStreamHandler handler )
+        throws TaskException
     {
         try
         {

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

@@ -13,6 +13,7 @@ import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.LogStreamHandler;
 import org.apache.tools.ant.types.Commandline;
+import java.io.IOException;
 
 /**
  * A base class for creating tasks for executing commands on ClearCase. <p>
@@ -103,6 +104,7 @@ public abstract class ClearCase extends Task
     }
 
     protected int run( Commandline cmd )
+        throws TaskException
     {
         try
         {
@@ -113,7 +115,7 @@ public abstract class ClearCase extends Task
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }
-        catch( java.io.IOException e )
+        catch( IOException e )
         {
             throw new TaskException( "Error", e );
         }

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java

@@ -105,6 +105,7 @@ public class Depend extends MatchingTask
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( dependClasspath == null )
         {
@@ -122,6 +123,7 @@ public class Depend extends MatchingTask
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -178,6 +180,7 @@ public class Depend extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( dependClasspath == null )
         {
@@ -359,6 +362,7 @@ public class Depend extends MatchingTask
      * @return a vector containing the classes to analyse.
      */
     private Vector getClassFiles( Path classLocations )
+        throws TaskException
     {
         // break the classLocations into its components.
         String[] classLocationsList = classLocations.list();

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java

@@ -280,6 +280,7 @@ public class CSharp
      */
 
     public CSharp()
+        throws TaskException
     {
         Clear();
         setIncludes( csc_file_pattern );
@@ -417,6 +418,7 @@ public class CSharp
      * @param path another path to append
      */
     public void setReferenceFiles( Path path )
+        throws TaskException
     {
         //demand create pathlist
         if( _referenceFiles == null )

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java

@@ -119,6 +119,7 @@ public class Ilasm
      * constructor inits everything and set up the search pattern
      */
     public Ilasm()
+        throws TaskException
     {
         Clear();
         setIncludes( file_pattern );

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

@@ -76,6 +76,7 @@ public class NetCommand
      */
 
     public NetCommand( Task owner, String title, String program )
+        throws TaskException
     {
         _owner = owner;
         _title = title;
@@ -196,6 +197,7 @@ public class NetCommand
      * set up the command sequence..
      */
     protected void prepareExecutor()
+        throws TaskException
     {
         // default directory to the project's base directory
         File dir = _owner.getProject().getBaseDir();

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

@@ -55,6 +55,7 @@ public class BorlandGenerateClient extends Task
     Path classpath;
 
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( this.classpath == null )
         {
@@ -67,6 +68,7 @@ public class BorlandGenerateClient extends Task
     }
 
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -92,6 +94,7 @@ public class BorlandGenerateClient extends Task
     }
 
     public Path createClasspath()
+        throws TaskException
     {
         if( this.classpath == null )
         {

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

@@ -59,6 +59,7 @@ public class JlinkTask extends MatchingTask
      * @param addfiles The new Addfiles value
      */
     public void setAddfiles( Path addfiles )
+        throws TaskException
     {
         if( this.addfiles == null )
         {
@@ -86,6 +87,7 @@ public class JlinkTask extends MatchingTask
      * @param mergefiles The new Mergefiles value
      */
     public void setMergefiles( Path mergefiles )
+        throws TaskException
     {
         if( this.mergefiles == null )
         {
@@ -113,6 +115,7 @@ public class JlinkTask extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createAddfiles()
+        throws TaskException
     {
         if( this.addfiles == null )
         {
@@ -128,6 +131,7 @@ public class JlinkTask extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createMergefiles()
+        throws TaskException
     {
         if( this.mergefiles == null )
         {
@@ -179,11 +183,13 @@ public class JlinkTask extends MatchingTask
     }
 
     private boolean haveAddFiles()
+        throws TaskException
     {
         return haveEntries( addfiles );
     }
 
     private boolean haveEntries( Path p )
+        throws TaskException
     {
         if( p == null )
         {
@@ -197,9 +203,9 @@ public class JlinkTask extends MatchingTask
     }
 
     private boolean haveMergeFiles()
+        throws TaskException
     {
         return haveEntries( mergefiles );
     }
-
 }
 

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

@@ -101,6 +101,7 @@ public class JspC extends MatchingTask
      * @param cp The new Classpath value
      */
     public void setClasspath( Path cp )
+        throws TaskException
     {
         if( classpath == null )
             classpath = cp;
@@ -114,6 +115,7 @@ public class JspC extends MatchingTask
      * @param r The new ClasspathRef value
      */
     public void setClasspathRef( Reference r )
+        throws TaskException
     {
         createClasspath().setRefid( r );
     }
@@ -187,6 +189,7 @@ public class JspC extends MatchingTask
      * @param srcDir The new Srcdir value
      */
     public void setSrcdir( Path srcDir )
+        throws TaskException
     {
         if( src == null )
         {
@@ -309,6 +312,7 @@ public class JspC extends MatchingTask
      * @return Description of the Returned Value
      */
     public Path createClasspath()
+        throws TaskException
     {
         if( classpath == null )
             classpath = new Path( project );

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

@@ -74,6 +74,7 @@ public class WLJspc extends MatchingTask
      * @param classpath The new Classpath value
      */
     public void setClasspath( Path classpath )
+        throws TaskException
     {
         if( compileClasspath == null )
         {
@@ -92,7 +93,6 @@ public class WLJspc extends MatchingTask
      */
     public void setDest( File dirName )
     {
-
         destinationDirectory = dirName;
     }
 

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

@@ -319,7 +319,7 @@ public class Pvcs extends org.apache.tools.ant.Task
      *      build...
      */
     public void execute()
-        throws org.apache.tools.ant.TaskException
+        throws TaskException
     {
         Project aProj = getProject();
         int result = 0;
@@ -446,6 +446,7 @@ public class Pvcs extends org.apache.tools.ant.Task
     }
 
     protected int runCmd( Commandline cmd, ExecuteStreamHandler out )
+        throws TaskException
     {
         try
         {

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

@@ -200,6 +200,7 @@ public abstract class MSVSS extends Task
     }
 
     protected int run( Commandline cmd )
+        throws TaskException
     {
         try
         {

proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.java

@@ -141,6 +141,7 @@ public class MSVSSHISTORY extends MSVSS
      * @param attr The new Style value
      */
     public void setStyle( BriefCodediffNofile attr )
+        throws TaskException
     {
         String option = attr.getValue();
         if( option.equals( "brief" ) )

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

@@ -10,6 +10,7 @@ package org.apache.tools.ant.taskdefs.rmic;
 import java.io.File;
 import java.util.Random;
 import java.util.Vector;
+import org.apache.myrmidon.api.TaskException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Rmic;
 import org.apache.tools.ant.types.Commandline;
@@ -51,6 +52,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return The Classpath value
      */
     public Path getClasspath()
+        throws TaskException
     {
         return getCompileClasspath();
     }
@@ -77,6 +79,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return Description of the Returned Value
      */
     protected Commandline setupRmicCommand()
+        throws TaskException
     {
         return setupRmicCommand( null );
     }
@@ -88,6 +91,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return Description of the Returned Value
      */
     protected Commandline setupRmicCommand( String[] options )
+        throws TaskException
     {
         Commandline cmd = new Commandline();
 
@@ -178,6 +182,7 @@ public abstract class DefaultRmicAdapter implements RmicAdapter
      * @return The CompileClasspath value
      */
     protected Path getCompileClasspath()
+        throws TaskException
     {
         // add dest dir to classpath so that previously compiled and
         // untouched classes are on classpath

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

@@ -57,5 +57,6 @@ public interface RmicAdapter
      *
      * @return The Classpath value
      */
-    Path getClasspath();
+    Path getClasspath()
+        throws TaskException;
 }

proposal/myrmidon/src/todo/org/apache/tools/ant/types/DataType.java

@@ -92,12 +92,6 @@ public abstract class DataType
         return ref != null;
     }
 
-    public void execute()
-        throws TaskException
-    {
-        //HACK: NOOP execute - should be deleted in the future!
-    }
-
     /**
      * Performs the check for circular references and returns the referenced
      * object.

proposal/myrmidon/src/todo/org/apache/tools/ant/util/FileNameMapper.java

@@ -7,6 +7,8 @@
  */
 package org.apache.tools.ant.util;
 
+import org.apache.myrmidon.api.TaskException;
+
 /**
  * Interface to be used by SourceFileScanner. <p>
  *
@@ -27,7 +29,8 @@ public interface FileNameMapper
      *
      * @param from The new From value
      */
-    void setFrom( String from );
+    void setFrom( String from )
+        throws TaskException;
 
     /**
      * Sets the to part of the transformation rule.

proposal/myrmidon/src/todo/org/apache/tools/ant/util/RegexpPatternMapper.java

@@ -69,9 +69,9 @@ public class RegexpPatternMapper implements FileNameMapper
      * @return Description of the Returned Value
      */
     public String[] mapFileName( String sourceFileName )
+        throws TaskException
     {
-        if( reg == null || to == null
-            || !reg.matches( sourceFileName ) )
+        if( reg == null || to == null || !reg.matches( sourceFileName ) )
         {
             return null;
         }
@@ -86,6 +86,7 @@ public class RegexpPatternMapper implements FileNameMapper
      * @return Description of the Returned Value
      */
     protected String replaceReferences( String source )
+        throws TaskException
     {
         Vector v = reg.getGroups( source );