diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java b/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java
index 0fbba77a9..e9a62b8b7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.api.TaskException;
 public abstract class ProjectComponent
     extends AbstractTask
 {
-    protected Project project;
+    private Project project;
 
     /**
      * Sets the project object of this component. This method is used by project
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
index d4a15e793..cdd95d7fa 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/TaskAdapter.java
@@ -51,7 +51,7 @@ public class TaskAdapter extends Task
                 c.getMethod( "setProject", new Class[]{Project.class} );
             if( setProjectM != null )
             {
-                setProjectM.invoke( proxy, new Object[]{project} );
+                setProjectM.invoke( proxy, new Object[]{getProject()} );
             }
         }
         catch( NoSuchMethodException e )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index a89933ea6..366ef5da3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -75,25 +75,25 @@ public class AntStructure extends Task
                 out = new PrintWriter( new FileWriter( output ) );
             }
 
-            printHead( out, project.getTaskDefinitions().keys(),
-                       project.getDataTypeDefinitions().keys() );
+            printHead( out, getProject().getTaskDefinitions().keys(),
+                       getProject().getDataTypeDefinitions().keys() );
 
             printTargetDecl( out );
 
-            Enumeration dataTypes = project.getDataTypeDefinitions().keys();
+            Enumeration dataTypes = getProject().getDataTypeDefinitions().keys();
             while( dataTypes.hasMoreElements() )
             {
                 String typeName = (String)dataTypes.nextElement();
                 printElementDecl( out, typeName,
-                                  (Class)project.getDataTypeDefinitions().get( typeName ) );
+                                  (Class)getProject().getDataTypeDefinitions().get( typeName ) );
             }
 
-            Enumeration tasks = project.getTaskDefinitions().keys();
+            Enumeration tasks = getProject().getTaskDefinitions().keys();
             while( tasks.hasMoreElements() )
             {
                 String taskName = (String)tasks.nextElement();
                 printElementDecl( out, taskName,
-                                  (Class)project.getTaskDefinitions().get( taskName ) );
+                                  (Class)getProject().getTaskDefinitions().get( taskName ) );
             }
 
             printTail( out );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
index 4c3d374ab..7c32052a7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -97,7 +97,7 @@ public class Available
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
@@ -107,7 +107,7 @@ public class Available
     {
         if( this.filepath == null )
         {
-            this.filepath = new Path( project );
+            this.filepath = new Path( getProject() );
         }
         return this.filepath.createPath();
     }
@@ -130,8 +130,8 @@ public class Available
 
         if( classpath != null )
         {
-            classpath.setProject( project );
-            this.loader = new AntClassLoader( project, classpath );
+            classpath.setProject( getProject() );
+            this.loader = new AntClassLoader( getProject(), classpath );
         }
 
         if( ( classname != null ) && !checkClass( classname ) )
@@ -178,7 +178,7 @@ public class Available
         if( eval() )
         {
             String lSep = System.getProperty( "line.separator" );
-            if( null == project.getProperty( property ) )
+            if( null == getProject().getProperty( property ) )
             {
                 setProperty( property, value );
             }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
index 71c1ddc6a..b6e5691fd 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
@@ -475,11 +475,11 @@ public class Checksum extends MatchingTask implements Condition
         for( int i = 0; i < sizeofFileSet; i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             String[] srcFiles = ds.getIncludedFiles();
             for( int j = 0; j < srcFiles.length; j++ )
             {
-                File src = new File( fs.getDir( project ), srcFiles[ j ] );
+                File src = new File( fs.getDir( getProject() ), srcFiles[ j ] );
                 addToIncludeFileMap( src );
             }
         }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java
index 0c74d8fd8..5cbab9e58 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Chmod.java
@@ -151,14 +151,14 @@ public class Chmod extends ExecuteOn
     public void execute()
         throws TaskException
     {
-        if( defaultSetDefined || defaultSet.getDir( project ) == null )
+        if( defaultSetDefined || defaultSet.getDir( getProject() ) == null )
         {
             super.execute();
         }
         else if( isValidOs() )
         {
             // we are chmodding the given directory
-            createArg().setValue( defaultSet.getDir( project ).getPath() );
+            createArg().setValue( defaultSet.getDir( getProject() ).getPath() );
             Execute execute = prepareExec();
             try
             {
@@ -190,7 +190,7 @@ public class Chmod extends ExecuteOn
             throw new TaskException( "Required attribute perm not set in chmod" );
         }
 
-        if( defaultSetDefined && defaultSet.getDir( project ) != null )
+        if( defaultSetDefined && defaultSet.getDir( getProject() ) != null )
         {
             addFileset( defaultSet );
         }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java
index 8e786d664..23ab376cf 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java
@@ -155,13 +155,13 @@ public class DependSet extends MatchingTask
         {
 
             FileSet targetFS = (FileSet)enumTargetSets.nextElement();
-            DirectoryScanner targetDS = targetFS.getDirectoryScanner( project );
+            DirectoryScanner targetDS = targetFS.getDirectoryScanner( getProject() );
             String[] targetFiles = targetDS.getIncludedFiles();
 
             for( int i = 0; i < targetFiles.length; i++ )
             {
 
-                File dest = new File( targetFS.getDir( project ), targetFiles[ i ] );
+                File dest = new File( targetFS.getDir( getProject() ), targetFiles[ i ] );
                 allTargets.addElement( dest );
 
                 if( dest.lastModified() > now )
@@ -181,12 +181,12 @@ public class DependSet extends MatchingTask
         {
 
             FileList targetFL = (FileList)enumTargetLists.nextElement();
-            String[] targetFiles = targetFL.getFiles( project );
+            String[] targetFiles = targetFL.getFiles( getProject() );
 
             for( int i = 0; i < targetFiles.length; i++ )
             {
 
-                File dest = new File( targetFL.getDir( project ), targetFiles[ i ] );
+                File dest = new File( targetFL.getDir( getProject() ), targetFiles[ i ] );
                 if( !dest.exists() )
                 {
                     log( targetFiles[ i ] + " does not exist.", Project.MSG_VERBOSE );
@@ -215,12 +215,12 @@ public class DependSet extends MatchingTask
             {
 
                 FileSet sourceFS = (FileSet)enumSourceSets.nextElement();
-                DirectoryScanner sourceDS = sourceFS.getDirectoryScanner( project );
+                DirectoryScanner sourceDS = sourceFS.getDirectoryScanner( getProject() );
                 String[] sourceFiles = sourceDS.getIncludedFiles();
 
                 for( int i = 0; upToDate && i < sourceFiles.length; i++ )
                 {
-                    File src = new File( sourceFS.getDir( project ), sourceFiles[ i ] );
+                    File src = new File( sourceFS.getDir( getProject() ), sourceFiles[ i ] );
 
                     if( src.lastModified() > now )
                     {
@@ -255,12 +255,12 @@ public class DependSet extends MatchingTask
             {
 
                 FileList sourceFL = (FileList)enumSourceLists.nextElement();
-                String[] sourceFiles = sourceFL.getFiles( project );
+                String[] sourceFiles = sourceFL.getFiles( getProject() );
 
                 int i = 0;
                 do
                 {
-                    File src = new File( sourceFL.getDir( project ), sourceFiles[ i ] );
+                    File src = new File( sourceFL.getDir( getProject() ), sourceFiles[ i ] );
 
                     if( src.lastModified() > now )
                     {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
index 17b89b25f..9b24ebba3 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java
@@ -108,7 +108,7 @@ public class Echo extends Task
     public void addText( String msg )
         throws TaskException
     {
-        message += project.replaceProperties( msg );
+        message += getProject().replaceProperties( msg );
     }
 
     /**
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 a1e719ad1..ebf00a749 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
@@ -122,7 +122,7 @@ public class ExecuteOn extends ExecTask
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        mapperElement = new Mapper( project );
+        mapperElement = new Mapper( getProject() );
         return mapperElement;
     }
 
@@ -385,8 +385,8 @@ public class ExecuteOn extends ExecTask
             for( int i = 0; i < filesets.size(); i++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( i );
-                File base = fs.getDir( project );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                File base = fs.getDir( getProject() );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
 
                 if( !"dir".equals( type ) )
                 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java
index 909cf3c07..26f4508d4 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Expand.java
@@ -132,8 +132,8 @@ public class Expand extends MatchingTask
             for( int j = 0; j < filesets.size(); j++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( j );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
-                File fromDir = fs.getDir( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+                File fromDir = fs.getDir( getProject() );
 
                 String[] files = ds.getIncludedFiles();
                 for( int i = 0; i < files.length; ++i )
@@ -201,7 +201,7 @@ public class Expand extends MatchingTask
             for( int v = 0; v < patternsets.size(); v++ )
             {
                 PatternSet p = (PatternSet)patternsets.elementAt( v );
-                String[] incls = p.getIncludePatterns( project );
+                String[] incls = p.getIncludePatterns( getProject() );
                 if( incls != null )
                 {
                     for( int w = 0; w < incls.length; w++ )
@@ -214,7 +214,7 @@ public class Expand extends MatchingTask
                         }
                     }
                 }
-                String[] excls = p.getExcludePatterns( project );
+                String[] excls = p.getExcludePatterns( getProject() );
                 if( excls != null )
                 {
                     for( int w = 0; w < excls.length; w++ )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java
index d8ac808ad..ebc095912 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java
@@ -57,7 +57,7 @@ public class Filter extends Task
 
         if( isSingleFilter )
         {
-            project.getGlobalFilterSet().addFilter( token, value );
+            getProject().getGlobalFilterSet().addFilter( token, value );
         }
 
         if( isFiltersFromFile )
@@ -70,6 +70,6 @@ public class Filter extends Task
         throws TaskException
     {
         log( "Reading filters from " + filtersFile, Project.MSG_VERBOSE );
-        project.getGlobalFilterSet().readFiltersFromFile( filtersFile );
+        getProject().getGlobalFilterSet().readFiltersFromFile( filtersFile );
     }
 }
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 40e362cf3..7ef6352d0 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
@@ -140,7 +140,7 @@ public class GenerateKey
     public void execute()
         throws TaskException
     {
-        if( project.getJavaVersion().equals( Project.JAVA_1_1 ) )
+        if( getProject().getJavaVersion().equals( Project.JAVA_1_1 ) )
         {
             throw new TaskException( "The genkey task is only available on JDK" +
                                      " versions 1.2 or greater" );
@@ -162,7 +162,7 @@ public class GenerateKey
         }
 
         getLogger().info( "Generating Key for " + alias );
-        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+        final ExecTask cmd = (ExecTask)getProject().createTask( "exec" );
         cmd.setExecutable( "keytool" );
 
         cmd.createArg().setValue( "-genkey " );
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 b5f67a6e2..fb9caa95d 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
@@ -95,7 +95,7 @@ public class Get extends Task
      */
     public void setUseTimestamp( boolean v )
     {
-        if( project.getJavaVersion() != Project.JAVA_1_1 )
+        if( getProject().getJavaVersion() != Project.JAVA_1_1 )
         {
             useTimestamp = v;
         }
@@ -300,9 +300,9 @@ public class Get extends Task
         throws TaskException
     {
 
-        if( project.getJavaVersion() != Project.JAVA_1_1 )
+        if( getProject().getJavaVersion() != Project.JAVA_1_1 )
         {
-            Touch touch = (Touch)project.createTask( "touch" );
+            Touch touch = (Touch)getProject().createTask( "touch" );
             touch.setFile( file );
             touch.setMillis( timemillis );
             touch.touch();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
index 6a11e80a0..0aa20f30e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java
@@ -89,7 +89,7 @@ public class Input extends Task
     public void addText( String msg )
         throws TaskException
     {
-        message += project.replaceProperties( msg );
+        message += getProject().replaceProperties( msg );
     }
 
     /**
@@ -143,7 +143,7 @@ public class Input extends Task
         // adopted from org.apache.tools.ant.taskdefs.Property
         if( addproperty != null )
         {
-            if( project.getProperty( addproperty ) == null )
+            if( getProject().getProperty( addproperty ) == null )
             {
                 setProperty( addproperty, input );
             }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
index 1245ef5a3..ef0151e5d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -197,7 +197,7 @@ public class Java extends Task
     public Path createClasspath()
         throws TaskException
     {
-        return cmdl.createClasspath( project ).createPath();
+        return cmdl.createClasspath( getProject() ).createPath();
     }
 
     /**
@@ -339,7 +339,7 @@ public class Java extends Task
             try
             {
                 outStream = new PrintStream( new FileOutputStream( out ) );
-                exe.execute( project );
+                exe.execute( getProject() );
             }
             catch( IOException io )
             {
@@ -355,7 +355,7 @@ public class Java extends Task
         }
         else
         {
-            exe.execute( project );
+            exe.execute( getProject() );
         }
     }
 
@@ -385,7 +385,7 @@ public class Java extends Task
                 exe = new Execute( new PumpStreamHandler( fos ), null );
             }
 
-            exe.setAntRun( project );
+            exe.setAntRun( getProject() );
 
             if( dir == null )
             {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 5effa3dc5..28b47f7ee 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -646,7 +646,7 @@ public class Javac extends MatchingTask
     public boolean isForkedJavac()
     {
         return !"false".equals( fork ) ||
-            "extJavac".equals( project.getProperty( "build.compiler" ) );
+            "extJavac".equals( getProject().getProperty( "build.compiler" ) );
     }
 
     /**
@@ -659,7 +659,7 @@ public class Javac extends MatchingTask
     {
         if( bootclasspath == null )
         {
-            bootclasspath = new Path( project );
+            bootclasspath = new Path( getProject() );
         }
         return bootclasspath.createPath();
     }
@@ -674,7 +674,7 @@ public class Javac extends MatchingTask
     {
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
         return compileClasspath.createPath();
     }
@@ -702,7 +702,7 @@ public class Javac extends MatchingTask
     {
         if( extdirs == null )
         {
-            extdirs = new Path( project );
+            extdirs = new Path( getProject() );
         }
         return extdirs.createPath();
     }
@@ -717,7 +717,7 @@ public class Javac extends MatchingTask
     {
         if( src == null )
         {
-            src = new Path( project );
+            src = new Path( getProject() );
         }
         return src.createPath();
     }
@@ -870,7 +870,7 @@ public class Javac extends MatchingTask
 
     private String determineCompiler()
     {
-        String compiler = project.getProperty( "build.compiler" );
+        String compiler = getProject().getProperty( "build.compiler" );
 
         if( !"false".equals( fork ) )
         {
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 e152dfecd..db4e1dad1 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
@@ -576,7 +576,7 @@ public class Javadoc extends Task
     {
         if( bootclasspath == null )
         {
-            bootclasspath = new Path( project );
+            bootclasspath = new Path( getProject() );
         }
         return bootclasspath.createPath();
     }
@@ -586,7 +586,7 @@ public class Javadoc extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -616,7 +616,7 @@ public class Javadoc extends Task
     {
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
         }
         return sourcePath.createPath();
     }
@@ -918,7 +918,7 @@ public class Javadoc extends Task
         JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO );
         JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN );
         Execute exe = new Execute( new PumpStreamHandler( out, err ) );
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
 
         /*
          * No reason to change the working directory as all filenames and
@@ -971,7 +971,7 @@ public class Javadoc extends Task
     protected String expand( String content )
         throws TaskException
     {
-        return project.replaceProperties( content );
+        return getProject().replaceProperties( content );
     }
 
     private String getJavadocExecutableName()
@@ -1130,7 +1130,7 @@ public class Javadoc extends Task
                 File source = resolveFile( list[ j ] );
                 fs.setDir( source );
 
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] packageDirs = ds.getIncludedDirectories();
 
                 for( int i = 0; i < packageDirs.length; i++ )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
index fe4031107..bcb14e657 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -157,7 +157,7 @@ public abstract class MatchingTask extends Task
     {
         fileset.setDir( baseDir );
         fileset.setDefaultexcludes( useDefaultExcludes );
-        return fileset.getDirectoryScanner( project );
+        return fileset.getDirectoryScanner( getProject() );
     }
 
 }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
index 63c9ec2b7..f9363dacb 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
@@ -131,7 +131,7 @@ public class Property extends Task
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
@@ -195,7 +195,7 @@ public class Property extends Task
             String name = (String)e.nextElement();
             String value = (String)props.getProperty( name );
 
-            String v = project.replaceProperties( value );
+            String v = getProject().replaceProperties( value );
             addProperty( name, v );
         }
     }
@@ -278,7 +278,7 @@ public class Property extends Task
 
             if( classpath != null )
             {
-                cL = new AntClassLoader( project, classpath );
+                cL = new AntClassLoader( getProject(), classpath );
             }
             else
             {
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 88eb97f8b..5b4ddb0da 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
@@ -502,7 +502,7 @@ public class Rmic extends MatchingTask
     {
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
         return compileClasspath.createPath();
     }
@@ -517,7 +517,7 @@ public class Rmic extends MatchingTask
     {
         if( extdirs == null )
         {
-            extdirs = new Path( project );
+            extdirs = new Path( getProject() );
         }
         return extdirs.createPath();
     }
@@ -539,14 +539,14 @@ public class Rmic extends MatchingTask
             log( "Verify has been turned on.", Project.MSG_INFO );
         }
 
-        String compiler = project.getProperty( "build.rmic" );
+        String compiler = getProject().getProperty( "build.rmic" );
         RmicAdapter adapter = RmicAdapterFactory.getRmic( compiler, this );
 
         // now we need to populate the compiler adapter
         adapter.setRmic( this );
 
         Path classpath = adapter.getClasspath();
-        loader = new AntClassLoader( project, classpath );
+        loader = new AntClassLoader( getProject(), classpath );
 
         // scan base dirs to build up compile lists only if a
         // specific classname is not given
@@ -684,7 +684,7 @@ public class Rmic extends MatchingTask
             {
                 if( filtering )
                 {
-                    final FilterSetCollection filters = new FilterSetCollection( project.getGlobalFilterSet() );
+                    final FilterSetCollection filters = new FilterSetCollection( getProject().getGlobalFilterSet() );
                     FileUtils.copyFile( oldFile, newFile, filters );
                 }
                 else
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
index f13e8fd86..fec15b3ee 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -370,7 +370,7 @@ public class SQLExec extends Task
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
@@ -410,8 +410,8 @@ public class SQLExec extends Task
             for( int i = 0; i < filesets.size(); i++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( i );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
-                File srcDir = fs.getDir( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+                File srcDir = fs.getDir( getProject() );
 
                 String[] srcFiles = ds.getIncludedFiles();
 
@@ -459,7 +459,7 @@ public class SQLExec extends Task
                 log( "Loading " + driver + " using AntClassLoader with classpath " + classpath,
                      Project.MSG_VERBOSE );
 
-                loader = new AntClassLoader( project, classpath );
+                loader = new AntClassLoader( getProject(), classpath );
                 dc = loader.loadClass( driver );
             }
             else
@@ -754,7 +754,7 @@ public class SQLExec extends Task
             while( ( line = in.readLine() ) != null )
             {
                 line = line.trim();
-                line = project.replaceProperties( line );
+                line = getProject().replaceProperties( line );
                 if( line.startsWith( "//" ) )
                     continue;
                 if( line.startsWith( "--" ) )
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 4128a9b5f..70f8c1c24 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
@@ -155,11 +155,11 @@ public class SignJar extends Task
             for( int i = 0; i < filesets.size(); i++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( i );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] jarFiles = ds.getIncludedFiles();
                 for( int j = 0; j < jarFiles.length; j++ )
                 {
-                    doOneJar( new File( fs.getDir( project ), jarFiles[ j ] ), null );
+                    doOneJar( new File( fs.getDir( getProject() ), jarFiles[ j ] ), null );
                 }
             }
         }
@@ -249,7 +249,7 @@ public class SignJar extends Task
     private void doOneJar( File jarSource, File jarTarget )
         throws TaskException
     {
-        if( project.getJavaVersion().equals( Project.JAVA_1_1 ) )
+        if( getProject().getJavaVersion().equals( Project.JAVA_1_1 ) )
         {
             throw new TaskException( "The signjar task is only available on JDK versions 1.2 or greater" );
         }
@@ -269,7 +269,7 @@ public class SignJar extends Task
 
         final StringBuffer sb = new StringBuffer();
 
-        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+        final ExecTask cmd = (ExecTask)getProject().createTask( "exec" );
         cmd.setExecutable( "jarsigner" );
 
         if( null != keystore )
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 e736f4fe2..9899ad7c9 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
@@ -145,7 +145,7 @@ public class Tar
         for( Enumeration e = filesets.elements(); e.hasMoreElements(); )
         {
             TarFileSet fs = (TarFileSet)e.nextElement();
-            String[] files = fs.getFiles( project );
+            String[] files = fs.getFiles( getProject() );
 
             if( !archiveIsUpToDate( files ) )
             {
@@ -154,7 +154,7 @@ public class Tar
 
             for( int i = 0; i < files.length; ++i )
             {
-                if( tarFile.equals( new File( fs.getDir( project ), files[ i ] ) ) )
+                if( tarFile.equals( new File( fs.getDir( getProject() ), files[ i ] ) ) )
                 {
                     throw new TaskException( "A tar file cannot include itself" );
                 }
@@ -194,10 +194,10 @@ public class Tar
             for( Enumeration e = filesets.elements(); e.hasMoreElements(); )
             {
                 TarFileSet fs = (TarFileSet)e.nextElement();
-                String[] files = fs.getFiles( project );
+                String[] files = fs.getFiles( getProject() );
                 for( int i = 0; i < files.length; i++ )
                 {
-                    File f = new File( fs.getDir( project ), files[ i ] );
+                    File f = new File( fs.getDir( getProject() ), files[ i ] );
                     String name = files[ i ].replace( File.separatorChar, '/' );
                     tarFile( f, tOut, name, fs );
                 }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java
index 2fe39ed33..fe525745a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Touch.java
@@ -148,7 +148,7 @@ public class Touch extends Task
             }
         }
 
-        if( millis >= 0 && project.getJavaVersion() == Project.JAVA_1_1 )
+        if( millis >= 0 && getProject().getJavaVersion() == Project.JAVA_1_1 )
         {
             log( "modification time of files cannot be set in JDK 1.1",
                  Project.MSG_WARN );
@@ -171,8 +171,8 @@ public class Touch extends Task
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
-            File fromDir = fs.getDir( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+            File fromDir = fs.getDir( getProject() );
 
             String[] srcFiles = ds.getIncludedFiles();
             String[] srcDirs = ds.getIncludedDirectories();
@@ -202,7 +202,7 @@ public class Touch extends Task
             throw new TaskException( "Can not change modification date of read-only file " + file );
         }
 
-        if( project.getJavaVersion() == Project.JAVA_1_1 )
+        if( getProject().getJavaVersion() == Project.JAVA_1_1 )
         {
             return;
         }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
index bd4439c6d..7db444e12 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -73,7 +73,7 @@ public class Tstamp extends Task
             while( i.hasMoreElements() )
             {
                 CustomFormat cts = (CustomFormat)i.nextElement();
-                cts.execute( project, d );
+                cts.execute( getProject(), d );
             }
 
         }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
index 21a9910e1..bc4250e2a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -97,7 +97,7 @@ public class UpToDate extends MatchingTask implements Condition
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        mapperElement = new Mapper( project );
+        mapperElement = new Mapper( getProject() );
         return mapperElement;
     }
 
@@ -128,8 +128,8 @@ public class UpToDate extends MatchingTask implements Condition
         while( upToDate && enum.hasMoreElements() )
         {
             FileSet fs = (FileSet)enum.nextElement();
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
-            upToDate = upToDate && scanDir( fs.getDir( project ),
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+            upToDate = upToDate && scanDir( fs.getDir( getProject() ),
                                             ds.getIncludedFiles() );
         }
         return upToDate;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java
index e2607fd29..8a8fb5fc9 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java
@@ -266,7 +266,7 @@ public class Zip extends MatchingTask
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            dss.addElement( fs.getDirectoryScanner( project ) );
+            dss.addElement( fs.getDirectoryScanner( getProject() ) );
         }
         int dssSize = dss.size();
         FileScanner[] scanners = new FileScanner[ dssSize ];
@@ -541,7 +541,7 @@ public class Zip extends MatchingTask
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
 
             String prefix = "";
             String fullpath = "";
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java
index bdce3e39d..299b94ad2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec/ExecTask.java
@@ -393,7 +393,7 @@ public class ExecTask extends Task
         log( cmdl.toString(), Project.MSG_VERBOSE );
 
         Execute exe = new Execute( createHandler(), createWatchdog() );
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
         exe.setWorkingDirectory( dir );
         exe.setVMLauncher( vmLauncher );
         String[] environment = env.getVariables();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
index e1cd0f297..7e7c73021 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -200,7 +200,7 @@ public class Copy
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        m_mapperElement = new Mapper( project );
+        m_mapperElement = new Mapper( getProject() );
         return m_mapperElement;
     }
 
@@ -249,8 +249,8 @@ public class Copy
         for( int i = 0; i < m_filesets.size(); i++ )
         {
             final FileSet fileSet = (FileSet)m_filesets.elementAt( i );
-            final DirectoryScanner scanner = fileSet.getDirectoryScanner( project );
-            final File fromDir = fileSet.getDir( project );
+            final DirectoryScanner scanner = fileSet.getDirectoryScanner( getProject() );
+            final File fromDir = fileSet.getDir( getProject() );
 
             final String[] srcFiles = scanner.getIncludedFiles();
             final String[] srcDirs = scanner.getIncludedDirectories();
@@ -419,7 +419,7 @@ public class Copy
         final FilterSetCollection executionFilters = new FilterSetCollection();
         if( m_filtering )
         {
-            executionFilters.addFilterSet( project.getGlobalFilterSet() );
+            executionFilters.addFilterSet( getProject().getGlobalFilterSet() );
         }
 
         for( final Enumeration filterEnum = m_filterSets.elements(); filterEnum.hasMoreElements(); )
@@ -506,7 +506,7 @@ public class Copy
             else
             {
                 FileSet fs = (FileSet)m_filesets.elementAt( 0 );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] srcFiles = ds.getIncludedFiles();
 
                 if( srcFiles.length > 0 )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
index 2326c7658..b4f1a9045 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Delete.java
@@ -307,10 +307,10 @@ public class Delete
             FileSet fs = (FileSet)filesets.elementAt( i );
             try
             {
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] files = ds.getIncludedFiles();
                 String[] dirs = ds.getIncludedDirectories();
-                removeFiles( fs.getDir( project ), files, dirs );
+                removeFiles( fs.getDir( getProject() ), files, dirs );
             }
             catch( TaskException be )
             {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
index 539e0332f..7ea0e7175 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/file/Move.java
@@ -151,7 +151,7 @@ public class Move extends Copy
                             FilterSetCollection executionFilters = new FilterSetCollection();
                             if( isFiltering() )
                             {
-                                executionFilters.addFilterSet( project.getGlobalFilterSet() );
+                                executionFilters.addFilterSet( getProject().getGlobalFilterSet() );
                             }
                             for( Enumeration filterEnum = getFilterSets().elements(); filterEnum.hasMoreElements(); )
                             {
@@ -215,7 +215,7 @@ public class Move extends Copy
             while( e.hasMoreElements() )
             {
                 FileSet fs = (FileSet)e.nextElement();
-                File dir = fs.getDir( project );
+                File dir = fs.getDir( getProject() );
 
                 if( okToDelete( dir ) )
                 {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index 03e998e36..5711b89f9 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -94,7 +94,7 @@ public class ANTLR extends Task
      */
     public Path createClasspath()
     {
-        return commandline.createClasspath( project ).createPath();
+        return commandline.createClasspath( getProject() ).createPath();
     }
 
     /**
@@ -139,7 +139,7 @@ public class ANTLR extends Task
                 ExecuteJava exe = new ExecuteJava();
                 exe.setJavaCommand( commandline.getJavaCommand() );
                 exe.setClasspath( commandline.getClasspath() );
-                exe.execute( project );
+                exe.execute( getProject() );
             }
         }
     }
@@ -229,7 +229,7 @@ public class ANTLR extends Task
     {
         Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
                                                          Project.MSG_WARN ), null );
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
         if( workingdir != null )
         {
             exe.setWorkingDirectory( workingdir );
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 0ca4f675f..e2362cacf 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
@@ -206,7 +206,7 @@ public class Cab extends MatchingTask
                 FileSet fs = (FileSet)filesets.elementAt( i );
                 if( fs != null )
                 {
-                    appendFiles( files, fs.getDirectoryScanner( project ) );
+                    appendFiles( files, fs.getDirectoryScanner( getProject() ) );
                 }
             }
         }
@@ -310,7 +310,7 @@ public class Cab extends MatchingTask
     protected ExecTask createExec()
         throws TaskException
     {
-        return (ExecTask)project.createTask( "exec" );
+        return (ExecTask)getProject().createTask( "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 234d798b9..73fa29015 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
@@ -721,7 +721,7 @@ public class IContract extends MatchingTask
             // Prepare the directories for iContract. iContract will make them if they
             // don't exist, but for some reason I don't know, it will complain about the REP files
             // afterwards
-            Mkdir mkdir = (Mkdir)project.createTask( "mkdir" );
+            Mkdir mkdir = (Mkdir)getProject().createTask( "mkdir" );
             mkdir.setDir( instrumentDir );
             mkdir.execute();
             mkdir.setDir( buildDir );
@@ -733,7 +733,7 @@ public class IContract extends MatchingTask
             Path baseClasspath = createClasspath();
 
             // Might need to add the core classes if we're not using Sun's Javac (like Jikes)
-            String compiler = project.getProperty( "build.compiler" );
+            String compiler = getProject().getProperty( "build.compiler" );
             ClasspathHelper classpathHelper = new ClasspathHelper( compiler );
             classpathHelper.modify( baseClasspath );
 
@@ -764,7 +764,7 @@ public class IContract extends MatchingTask
             iContractClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) );
 
             // Create a forked java process
-            Java iContract = (Java)project.createTask( "java" );
+            Java iContract = (Java)getProject().createTask( "java" );
             iContract.setFork( true );
             iContract.setClassname( "com.reliablesystems.iContract.Tool" );
             iContract.setClasspath( iContractClasspath );
@@ -1079,8 +1079,6 @@ public class IContract extends MatchingTask
      * BuildListener that sets the iContractMissing flag to true if a message
      * about missing iContract is missing. Used to indicate a more verbose error
      * to the user, with advice about how to solve the problem
-     *
-     * @author RT
      */
     private class IContractPresenceDetector implements BuildListener
     {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
index e47b070c0..726f8aed2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -206,7 +206,7 @@ public class Javah extends Task
     {
         if( bootclasspath == null )
         {
-            bootclasspath = new Path( project );
+            bootclasspath = new Path( getProject() );
         }
         return bootclasspath.createPath();
     }
@@ -222,7 +222,7 @@ public class Javah extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -264,7 +264,7 @@ public class Javah extends Task
             classpath = Path.systemClasspath;
         }
 
-        String compiler = project.getProperty( "build.compiler" );
+        String compiler = getProject().getProperty( "build.compiler" );
         if( compiler == null )
         {
             if( Project.getJavaVersion() != Project.JAVA_1_1 &&
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
index a86fd9e1f..526db8006 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
@@ -102,7 +102,7 @@ public class Native2Ascii extends MatchingTask
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        mapper = new Mapper( project );
+        mapper = new Mapper( getProject() );
         return mapper;
     }
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
index 8aaa97087..7c027b72a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
@@ -239,11 +239,11 @@ public class ReplaceRegExp extends Task
         throws TaskException
     {
         String res = input;
-        Regexp regexp = r.getRegexp( project );
+        Regexp regexp = r.getRegexp( getProject() );
 
         if( regexp.matches( input, options ) )
         {
-            res = regexp.substitute( input, s.getExpression( project ), options );
+            res = regexp.substitute( input, s.getExpression( getProject() ), options );
         }
 
         return res;
@@ -276,7 +276,7 @@ public class ReplaceRegExp extends Task
 
             boolean changes = false;
 
-            log( "Replacing pattern '" + regex.getPattern( project ) + "' with '" + subs.getExpression( project ) +
+            log( "Replacing pattern '" + regex.getPattern( getProject() ) + "' with '" + subs.getExpression( getProject() ) +
                  "' in '" + f.getPath() + "'" +
                  ( byline ? " by line" : "" ) +
                  ( flags.length() > 0 ? " with flags: '" + flags + "'" : "" ) +
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
index b770c3095..d19fa2389 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
@@ -189,7 +189,7 @@ public class Rpm extends Task
 
         Execute exe = new Execute( streamhandler, null );
 
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
         if( topDir == null ) topDir = getBaseDirectory();
         exe.setWorkingDirectory( topDir );
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
index 50020e2ec..f6ee2dd86 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
@@ -86,8 +86,8 @@ public class Script extends Task
     {
         try
         {
-            addBeans( project.getProperties() );
-            addBeans( project.getReferences() );
+            addBeans( getProject().getProperties() );
+            addBeans( getProject().getReferences() );
 
             beans.put( "project", getProject() );
 
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 5c8487d27..cb875064f 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
@@ -65,7 +65,7 @@ public abstract class Continuus extends Task
      */
     public final void setCcmDir( String dir )
     {
-        _ccmDir = project.translatePath( dir );
+        _ccmDir = getProject().translatePath( dir );
     }
 
     /**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index 61d6f6825..e2f8a11d7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -62,7 +62,7 @@ public abstract class ClearCase extends Task
      */
     public final void setClearToolDir( String dir )
     {
-        m_ClearToolDir = project.translatePath( dir );
+        m_ClearToolDir = getProject().translatePath( dir );
     }
 
     /**
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index c4d88840d..28147410d 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -184,7 +184,7 @@ public class Depend extends MatchingTask
     {
         if( dependClasspath == null )
         {
-            dependClasspath = new Path( project );
+            dependClasspath = new Path( getProject() );
         }
         return dependClasspath.createPath();
     }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
index 32c01cbb1..b6d5d40b7 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
@@ -422,7 +422,7 @@ public class CSharp
     {
         //demand create pathlist
         if( _referenceFiles == null )
-            _referenceFiles = new Path( this.project );
+            _referenceFiles = new Path( this.getProject() );
         _referenceFiles.append( path );
     }
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
index 97b69d5d4..caef7e82e 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
@@ -98,7 +98,7 @@ public class BorlandGenerateClient extends Task
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
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 4758d839b..3c9e44064 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
@@ -53,7 +53,7 @@ public class DDCreator extends MatchingTask
      */
     public void setClasspath( String s )
     {
-        this.classpath = project.translatePath( s );
+        this.classpath = getProject().translatePath( s );
     }
 
     /**
@@ -118,13 +118,13 @@ public class DDCreator extends MatchingTask
         }
 
         String systemClassPath = System.getProperty( "java.class.path" );
-        String execClassPath = project.translatePath( systemClassPath + ":" + classpath );
-        Java ddCreatorTask = (Java)project.createTask( "java" );
+        String execClassPath = getProject().translatePath( systemClassPath + ":" + classpath );
+        Java ddCreatorTask = (Java)getProject().createTask( "java" );
         ddCreatorTask.setFork( true );
         ddCreatorTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper" );
         Commandline.Argument arguments = ddCreatorTask.createArg();
         arguments.setLine( args );
-        ddCreatorTask.setClasspath( new Path( project, execClassPath ) );
+        ddCreatorTask.setClasspath( new Path( getProject(), execClassPath ) );
         if( ddCreatorTask.executeJava() != 0 )
         {
             throw new TaskException( "Execution of ddcreator helper failed" );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
index be80ac4e5..fba386032 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
@@ -255,7 +255,7 @@ public class EjbJar extends MatchingTask
     {
         if( config.classpath == null )
         {
-            config.classpath = new Path( project );
+            config.classpath = new Path( getProject() );
         }
         return config.classpath.createPath();
     }
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 52dfbed03..bf5654d95 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
@@ -64,7 +64,7 @@ public class Ejbc extends MatchingTask
      */
     public void setClasspath( String s )
     {
-        this.classpath = project.translatePath( s );
+        this.classpath = getProject().translatePath( s );
     }
 
     /**
@@ -159,14 +159,14 @@ public class Ejbc extends MatchingTask
         }
 
         String systemClassPath = System.getProperty( "java.class.path" );
-        String execClassPath = project.translatePath( systemClassPath + ":" + classpath +
+        String execClassPath = getProject().translatePath( systemClassPath + ":" + classpath +
                                                       ":" + generatedFilesDirectory );
         // get all the files in the descriptor directory
         DirectoryScanner ds = super.getDirectoryScanner( descriptorDirectory );
 
         String[] files = ds.getIncludedFiles();
 
-        Java helperTask = (Java)project.createTask( "java" );
+        Java helperTask = (Java)getProject().createTask( "java" );
         helperTask.setFork( true );
         helperTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.EjbcHelper" );
         String args = "";
@@ -183,7 +183,7 @@ public class Ejbc extends MatchingTask
 
         Commandline.Argument arguments = helperTask.createArg();
         arguments.setLine( args );
-        helperTask.setClasspath( new Path( project, execClassPath ) );
+        helperTask.setClasspath( new Path( getProject(), execClassPath ) );
         if( helperTask.executeJava() != 0 )
         {
             throw new TaskException( "Execution of ejbc helper failed" );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
index 57397d596..1a1fba9d2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
@@ -176,7 +176,7 @@ public class IPlanetEjbcTask extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
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 a57035fdc..4e3db6ffd 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
@@ -237,7 +237,7 @@ public class WLRun extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -251,7 +251,7 @@ public class WLRun extends Task
     {
         if( weblogicClasspath == null )
         {
-            weblogicClasspath = new Path( project );
+            weblogicClasspath = new Path( getProject() );
         }
         return weblogicClasspath.createPath();
     }
@@ -312,7 +312,7 @@ public class WLRun extends Task
             }
         }
 
-        Java weblogicServer = (Java)project.createTask( "java" );
+        Java weblogicServer = (Java)getProject().createTask( "java" );
         weblogicServer.setFork( true );
         weblogicServer.setClassname( weblogicMainClass );
 
@@ -362,7 +362,7 @@ public class WLRun extends Task
             throw new TaskException( "You must supply a management password to start the server" );
         }
 
-        Java weblogicServer = (Java)project.createTask( "java" );
+        Java weblogicServer = (Java)getProject().createTask( "java" );
         weblogicServer.setFork( true );
         weblogicServer.setDir( weblogicSystemHome );
         weblogicServer.setClassname( weblogicMainClass );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
index f8c8d1b9b..2a0151906 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
@@ -120,7 +120,7 @@ public class WLStop extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -145,7 +145,7 @@ public class WLStop extends Task
             throw new TaskException( "The url of the weblogic server must be provided." );
         }
 
-        Java weblogicAdmin = (Java)project.createTask( "java" );
+        Java weblogicAdmin = (Java)getProject().createTask( "java" );
         weblogicAdmin.setFork( true );
         weblogicAdmin.setClassname( "weblogic.Admin" );
         String args;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index cf10679e7..778b108fd 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -518,7 +518,7 @@ public class Translate extends MatchingTask
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             String[] srcFiles = ds.getIncludedFiles();
             for( int j = 0; j < srcFiles.length; j++ )
             {
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
index a31924865..5fcadc5dd 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
@@ -224,7 +224,7 @@ public class VAJImport extends VAJTask
      */
     protected void importFileset( FileSet fileset )
     {
-        DirectoryScanner ds = fileset.getDirectoryScanner( this.project );
+        DirectoryScanner ds = fileset.getDirectoryScanner( this.getProject() );
         if( ds.getIncludedFiles().length == 0 )
         {
             return;
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index bc4b7816b..fdc46a7fe 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -175,7 +175,7 @@ public class JJTree extends Task
         {
             throw new TaskException( "Javacchome not set." );
         }
-        final Path classpath = cmdl.createClasspath( project );
+        final Path classpath = cmdl.createClasspath( getProject() );
         classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
                                                "/JavaCC.zip" );
         classpath.addJavaRuntime();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 4a4d62de5..c36fe7688 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -225,7 +225,7 @@ public class JavaCC extends Task
         {
             throw new TaskException( "Javacchome not set." );
         }
-        final Path classpath = cmdl.createClasspath( project );
+        final Path classpath = cmdl.createClasspath( getProject() );
         classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
                                                "/JavaCC.zip" );
         classpath.addJavaRuntime();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index f155c3a4c..c5b7a43c0 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -206,7 +206,7 @@ public class JDependTask extends Task
     {
         if( _compileClasspath == null )
         {
-            _compileClasspath = new Path( project );
+            _compileClasspath = new Path( getProject() );
         }
         return _compileClasspath.createPath();
     }
@@ -233,7 +233,7 @@ public class JDependTask extends Task
     {
         if( _sourcesPath == null )
         {
-            _sourcesPath = new Path( project );
+            _sourcesPath = new Path( getProject() );
         }
         return _sourcesPath.createPath();
     }
@@ -340,7 +340,7 @@ public class JDependTask extends Task
         if( getDir() != null )
         {
             execute.setWorkingDirectory( getDir() );
-            execute.setAntRun( project );
+            execute.setAntRun( getProject() );
         }
 
         if( getOutputFile() != null )
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index 7fbfd1aa1..4136d0f97 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
@@ -315,7 +315,7 @@ public class JspC extends MatchingTask
         throws TaskException
     {
         if( classpath == null )
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         return classpath.createPath();
     }
 
@@ -376,7 +376,7 @@ public class JspC extends MatchingTask
 
         // compile the source files
 
-        String compiler = project.getProperty( "jsp.compiler" );
+        String compiler = getProject().getProperty( "jsp.compiler" );
         if( compiler == null )
         {
             compiler = "jasper";
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 216da4683..e26c4e873 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
@@ -127,7 +127,7 @@ public class WLJspc extends MatchingTask
     {
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
         return compileClasspath;
     }
@@ -161,7 +161,7 @@ public class WLJspc extends MatchingTask
         //use the systemclasspath as well, to include the ant jar
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
 
         compileClasspath.append( Path.systemClasspath );
@@ -171,7 +171,7 @@ public class WLJspc extends MatchingTask
         // Therefore, takes loads of time
         // Can pass directories at a time (*.jsp) but easily runs out of memory on hefty dirs
         // (even on  a Sun)
-        Java helperTask = (Java)project.createTask( "java" );
+        Java helperTask = (Java)getProject().createTask( "java" );
         helperTask.setFork( true );
         helperTask.setClassname( "weblogic.jspc" );
         String[] args = new String[ 12 ];
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 550c9d340..6fbbf4758 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -344,7 +344,7 @@ public class JUnitTask extends Task
      */
     public BatchTest createBatchTest()
     {
-        BatchTest test = new BatchTest( project );
+        BatchTest test = new BatchTest( getProject() );
         batchTests.addElement( test );
         return test;
     }
@@ -356,7 +356,7 @@ public class JUnitTask extends Task
      */
     public Path createClasspath()
     {
-        return commandline.createClasspath( project ).createPath();
+        return commandline.createClasspath( getProject() ).createPath();
     }
 
     /**
@@ -392,7 +392,7 @@ public class JUnitTask extends Task
         while( list.hasMoreElements() )
         {
             JUnitTest test = (JUnitTest)list.nextElement();
-            if( test.shouldRun( project ) )
+            if( test.shouldRun( getProject() ) )
             {
                 execute( test );
             }
@@ -655,7 +655,7 @@ public class JUnitTask extends Task
         // Create a temporary file to pass the Ant properties to the forked test
         File propsFile = new File( "junit" + ( new Random( System.currentTimeMillis() ) ).nextLong() + ".properties" );
         cmd.createArgument().setValue( "propsfile=" + propsFile.getAbsolutePath() );
-        Hashtable p = project.getProperties();
+        Hashtable p = getProject().getProperties();
         Properties props = new Properties();
         for( Enumeration enum = p.keys(); enum.hasMoreElements(); )
         {
@@ -675,7 +675,7 @@ public class JUnitTask extends Task
 
         Execute execute = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), watchdog );
         execute.setCommandline( cmd.getCommandline() );
-        execute.setAntRun( project );
+        execute.setAntRun( getProject() );
         if( dir != null )
         {
             execute.setWorkingDirectory( dir );
@@ -710,7 +710,7 @@ public class JUnitTask extends Task
     private int executeInVM( JUnitTest test )
         throws TaskException
     {
-        test.setProperties( project.getProperties() );
+        test.setProperties( getProject().getProperties() );
         if( dir != null )
         {
             log( "dir attribute ignored if running in the same VM", Project.MSG_WARN );
@@ -730,7 +730,7 @@ public class JUnitTask extends Task
             {
                 log( "Using CLASSPATH " + classpath, Project.MSG_VERBOSE );
 
-                cl = new AntClassLoader( null, project, classpath, false );
+                cl = new AntClassLoader( null, getProject(), classpath, false );
                 // make sure the test will be accepted as a TestCase
                 cl.addSystemPackageRoot( "junit" );
                 // will cause trouble in JDK 1.1 if omitted
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index 865c65649..35f5b9316 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
@@ -185,7 +185,7 @@ public class XMLResultAggregator extends Task implements XMLConstants
         }
         if( toDir == null )
         {
-            toDir = FileUtil.resolveFile( project.getBaseDir(), DEFAULT_DIR );
+            toDir = FileUtil.resolveFile( getProject().getBaseDir(), DEFAULT_DIR );
         }
         return new File( toDir, toFile );
     }
@@ -202,7 +202,7 @@ public class XMLResultAggregator extends Task implements XMLConstants
         for( int i = 0; i < size; i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             ds.scan();
             String[] f = ds.getIncludedFiles();
             for( int j = 0; j < f.length; j++ )
@@ -212,7 +212,7 @@ public class XMLResultAggregator extends Task implements XMLConstants
                 {
                     File file = new File( ds.getBasedir(), pathname );
                     file = FileUtil.
-                        resolveFile( project.getBaseDir(), file.getPath() );
+                        resolveFile( getProject().getBaseDir(), file.getPath() );
                     v.addElement( file );
                 }
             }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
index 94a06fb34..6db54b2ee 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
@@ -159,7 +159,7 @@ public abstract class AbstractMetamataTask extends Task
     {
         if( classPath == null )
         {
-            classPath = new Path( project );
+            classPath = new Path( getProject() );
         }
         return classPath;
     }
@@ -183,7 +183,7 @@ public abstract class AbstractMetamataTask extends Task
     {
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
         }
         return sourcePath;
     }
@@ -222,7 +222,7 @@ public abstract class AbstractMetamataTask extends Task
 
         // set the classpath as the jar file
         File jar = getMetamataJar( metamataHome );
-        final Path classPath = cmdl.createClasspath( project );
+        final Path classPath = cmdl.createClasspath( getProject() );
         classPath.createPathElement().setLocation( jar );
 
         // set the metamata.home property
@@ -374,7 +374,7 @@ public abstract class AbstractMetamataTask extends Task
         for( int i = 0; i < fileSets.size(); i++ )
         {
             FileSet fs = (FileSet)fileSets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             ds.scan();
             String[] f = ds.getIncludedFiles();
             log( i + ") Adding " + f.length + " files from directory " + ds.getBasedir(), Project.MSG_VERBOSE );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
index 89b71c7b9..89927ea6c 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
@@ -135,7 +135,7 @@ public class MAudit extends AbstractMetamataTask
     {
         if( searchPath == null )
         {
-            searchPath = new Path( project );
+            searchPath = new Path( getProject() );
         }
         return searchPath;
     }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
index 55f344c08..45af46117 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
@@ -113,7 +113,7 @@ public class MMetrics extends AbstractMetamataTask
     {
         if( path == null )
         {
-            path = new Path( project );
+            path = new Path( getProject() );
         }
         return path;
     }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
index 8f6c8e476..38bf45d6a 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
@@ -150,7 +150,7 @@ public class MParse extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath;
     }
@@ -174,7 +174,7 @@ public class MParse extends Task
     {
         if( sourcepath == null )
         {
-            sourcepath = new Path( project );
+            sourcepath = new Path( getProject() );
         }
         return sourcepath;
     }
@@ -211,7 +211,7 @@ public class MParse extends Task
 
         // set the classpath as the jar files
         File[] jars = getMetamataLibs();
-        final Path classPath = cmdl.createClasspath( project );
+        final Path classPath = cmdl.createClasspath( getProject() );
         for( int i = 0; i < jars.length; i++ )
         {
             classPath.createPathElement().setLocation( jars[ i ] );
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index cceea3844..6433bbcbc 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -798,12 +798,12 @@ public class FTP
 
         if( action == SEND_FILES )
         {
-            ds = fs.getDirectoryScanner( project );
+            ds = fs.getDirectoryScanner( getProject() );
         }
         else
         {
             ds = new FTPDirectoryScanner( ftp );
-            fs.setupDirectoryScanner( ds, project );
+            fs.setupDirectoryScanner( ds, getProject() );
             ds.scan();
         }
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
index 135fba5db..0781f3d1b 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
@@ -308,7 +308,7 @@ public class MimeMail extends Task
             FileSet fs = (FileSet)filesets.elementAt( i );
             if( fs != null )
             {
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] dsfiles = ds.getIncludedFiles();
                 File baseDir = ds.getBasedir();
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
index ae0f53b45..7fdde8ad6 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
@@ -124,7 +124,7 @@ public class P4Add extends P4Base
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             //File fromDir = fs.getDir(project);
 
             String[] srcFiles = ds.getIncludedFiles();
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index 58b5e93c6..f05edb4b2 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -100,11 +100,11 @@ public abstract class P4Base extends org.apache.tools.ant.Task
         //Get default P4 settings from environment - Mark would have done something cool with
         //introspection here.....:-)
         String tmpprop;
-        if( ( tmpprop = project.getProperty( "p4.port" ) ) != null )
+        if( ( tmpprop = getProject().getProperty( "p4.port" ) ) != null )
             setPort( tmpprop );
-        if( ( tmpprop = project.getProperty( "p4.client" ) ) != null )
+        if( ( tmpprop = getProject().getProperty( "p4.client" ) ) != null )
             setClient( tmpprop );
-        if( ( tmpprop = project.getProperty( "p4.user" ) ) != null )
+        if( ( tmpprop = getProject().getProperty( "p4.user" ) ) != null )
             setUser( tmpprop );
     }
 
@@ -167,7 +167,7 @@ public abstract class P4Base extends org.apache.tools.ant.Task
 
             Execute exe = new Execute( handler, null );
 
-            exe.setAntRun( project );
+            exe.setAntRun( getProject() );
 
             exe.setCommandline( commandline.getCommandline() );
 
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
index 7d78cbf3a..7ae4e6bdf 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
@@ -81,7 +81,7 @@ public class P4Change extends P4Base
 
         if( emptyChangeList == null )
             emptyChangeList = getEmptyChangeList();
-        final Project myProj = project;
+        final Project myProj = getProject();
 
         P4Handler handler =
             new P4HandlerAdapter()
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
index 73186ec9d..f8dd136e6 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
@@ -76,7 +76,7 @@ public class P4Counter extends P4Base
 
         if( shouldSetProperty )
         {
-            final Project myProj = project;
+            final Project myProj = getProject();
 
             P4Handler handler =
                 new P4HandlerAdapter()
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
index d71931254..3f3e42942 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
@@ -203,7 +203,7 @@ public class CovReport extends Task
     {
         if( coveragePath == null )
         {
-            coveragePath = new Path( project );
+            coveragePath = new Path( getProject() );
         }
         return coveragePath.createPath();
     }
@@ -221,7 +221,7 @@ public class CovReport extends Task
     {
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
         }
         return sourcePath.createPath();
     }
@@ -290,7 +290,7 @@ public class CovReport extends Task
         // as a default -sourcepath use . in JProbe, so use project .
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
             sourcePath.createPath().setLocation( getBaseDirectory() );
         }
         v.addElement( "-sourcepath=" + sourcePath );
@@ -364,7 +364,7 @@ public class CovReport extends Task
         {
             if( classPath == null )
             {
-                classPath = new Path( CovReport.this.project );
+                classPath = new Path( CovReport.this.getProject() );
             }
             return classPath.createPath();
         }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
index 6ca0d0ce1..d566cd128 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
@@ -229,7 +229,7 @@ public class Coverage extends Task
      */
     public Path createClasspath()
     {
-        return cmdlJava.createClasspath( project ).createPath();
+        return cmdlJava.createClasspath( getProject() ).createPath();
     }
 
     public Filters createFilters()
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 9b2228834..2441de660 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
@@ -135,7 +135,7 @@ public abstract class MSVSS extends Task
      */
     public final void setSsdir( String dir )
     {
-        m_SSDir = project.translatePath( dir );
+        m_SSDir = getProject().translatePath( dir );
     }
 
     /**
@@ -227,7 +227,7 @@ public abstract class MSVSS extends Task
                 exe.setEnvironment( newEnv );
             }
 
-            exe.setAntRun( project );
+            exe.setAntRun( getProject() );
             exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectComponent.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectComponent.java
index 0fbba77a9..e9a62b8b7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectComponent.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/ProjectComponent.java
@@ -20,7 +20,7 @@ import org.apache.myrmidon.api.TaskException;
 public abstract class ProjectComponent
     extends AbstractTask
 {
-    protected Project project;
+    private Project project;
 
     /**
      * Sets the project object of this component. This method is used by project
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java
index d4a15e793..cdd95d7fa 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/TaskAdapter.java
@@ -51,7 +51,7 @@ public class TaskAdapter extends Task
                 c.getMethod( "setProject", new Class[]{Project.class} );
             if( setProjectM != null )
             {
-                setProjectM.invoke( proxy, new Object[]{project} );
+                setProjectM.invoke( proxy, new Object[]{getProject()} );
             }
         }
         catch( NoSuchMethodException e )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java
index a89933ea6..366ef5da3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -75,25 +75,25 @@ public class AntStructure extends Task
                 out = new PrintWriter( new FileWriter( output ) );
             }
 
-            printHead( out, project.getTaskDefinitions().keys(),
-                       project.getDataTypeDefinitions().keys() );
+            printHead( out, getProject().getTaskDefinitions().keys(),
+                       getProject().getDataTypeDefinitions().keys() );
 
             printTargetDecl( out );
 
-            Enumeration dataTypes = project.getDataTypeDefinitions().keys();
+            Enumeration dataTypes = getProject().getDataTypeDefinitions().keys();
             while( dataTypes.hasMoreElements() )
             {
                 String typeName = (String)dataTypes.nextElement();
                 printElementDecl( out, typeName,
-                                  (Class)project.getDataTypeDefinitions().get( typeName ) );
+                                  (Class)getProject().getDataTypeDefinitions().get( typeName ) );
             }
 
-            Enumeration tasks = project.getTaskDefinitions().keys();
+            Enumeration tasks = getProject().getTaskDefinitions().keys();
             while( tasks.hasMoreElements() )
             {
                 String taskName = (String)tasks.nextElement();
                 printElementDecl( out, taskName,
-                                  (Class)project.getTaskDefinitions().get( taskName ) );
+                                  (Class)getProject().getTaskDefinitions().get( taskName ) );
             }
 
             printTail( out );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
index 4c3d374ab..7c32052a7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Available.java
@@ -97,7 +97,7 @@ public class Available
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
@@ -107,7 +107,7 @@ public class Available
     {
         if( this.filepath == null )
         {
-            this.filepath = new Path( project );
+            this.filepath = new Path( getProject() );
         }
         return this.filepath.createPath();
     }
@@ -130,8 +130,8 @@ public class Available
 
         if( classpath != null )
         {
-            classpath.setProject( project );
-            this.loader = new AntClassLoader( project, classpath );
+            classpath.setProject( getProject() );
+            this.loader = new AntClassLoader( getProject(), classpath );
         }
 
         if( ( classname != null ) && !checkClass( classname ) )
@@ -178,7 +178,7 @@ public class Available
         if( eval() )
         {
             String lSep = System.getProperty( "line.separator" );
-            if( null == project.getProperty( property ) )
+            if( null == getProject().getProperty( property ) )
             {
                 setProperty( property, value );
             }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java
index 71c1ddc6a..b6e5691fd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java
@@ -475,11 +475,11 @@ public class Checksum extends MatchingTask implements Condition
         for( int i = 0; i < sizeofFileSet; i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             String[] srcFiles = ds.getIncludedFiles();
             for( int j = 0; j < srcFiles.length; j++ )
             {
-                File src = new File( fs.getDir( project ), srcFiles[ j ] );
+                File src = new File( fs.getDir( getProject() ), srcFiles[ j ] );
                 addToIncludeFileMap( src );
             }
         }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java
index 0c74d8fd8..5cbab9e58 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Chmod.java
@@ -151,14 +151,14 @@ public class Chmod extends ExecuteOn
     public void execute()
         throws TaskException
     {
-        if( defaultSetDefined || defaultSet.getDir( project ) == null )
+        if( defaultSetDefined || defaultSet.getDir( getProject() ) == null )
         {
             super.execute();
         }
         else if( isValidOs() )
         {
             // we are chmodding the given directory
-            createArg().setValue( defaultSet.getDir( project ).getPath() );
+            createArg().setValue( defaultSet.getDir( getProject() ).getPath() );
             Execute execute = prepareExec();
             try
             {
@@ -190,7 +190,7 @@ public class Chmod extends ExecuteOn
             throw new TaskException( "Required attribute perm not set in chmod" );
         }
 
-        if( defaultSetDefined && defaultSet.getDir( project ) != null )
+        if( defaultSetDefined && defaultSet.getDir( getProject() ) != null )
         {
             addFileset( defaultSet );
         }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java
index 8e786d664..23ab376cf 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/DependSet.java
@@ -155,13 +155,13 @@ public class DependSet extends MatchingTask
         {
 
             FileSet targetFS = (FileSet)enumTargetSets.nextElement();
-            DirectoryScanner targetDS = targetFS.getDirectoryScanner( project );
+            DirectoryScanner targetDS = targetFS.getDirectoryScanner( getProject() );
             String[] targetFiles = targetDS.getIncludedFiles();
 
             for( int i = 0; i < targetFiles.length; i++ )
             {
 
-                File dest = new File( targetFS.getDir( project ), targetFiles[ i ] );
+                File dest = new File( targetFS.getDir( getProject() ), targetFiles[ i ] );
                 allTargets.addElement( dest );
 
                 if( dest.lastModified() > now )
@@ -181,12 +181,12 @@ public class DependSet extends MatchingTask
         {
 
             FileList targetFL = (FileList)enumTargetLists.nextElement();
-            String[] targetFiles = targetFL.getFiles( project );
+            String[] targetFiles = targetFL.getFiles( getProject() );
 
             for( int i = 0; i < targetFiles.length; i++ )
             {
 
-                File dest = new File( targetFL.getDir( project ), targetFiles[ i ] );
+                File dest = new File( targetFL.getDir( getProject() ), targetFiles[ i ] );
                 if( !dest.exists() )
                 {
                     log( targetFiles[ i ] + " does not exist.", Project.MSG_VERBOSE );
@@ -215,12 +215,12 @@ public class DependSet extends MatchingTask
             {
 
                 FileSet sourceFS = (FileSet)enumSourceSets.nextElement();
-                DirectoryScanner sourceDS = sourceFS.getDirectoryScanner( project );
+                DirectoryScanner sourceDS = sourceFS.getDirectoryScanner( getProject() );
                 String[] sourceFiles = sourceDS.getIncludedFiles();
 
                 for( int i = 0; upToDate && i < sourceFiles.length; i++ )
                 {
-                    File src = new File( sourceFS.getDir( project ), sourceFiles[ i ] );
+                    File src = new File( sourceFS.getDir( getProject() ), sourceFiles[ i ] );
 
                     if( src.lastModified() > now )
                     {
@@ -255,12 +255,12 @@ public class DependSet extends MatchingTask
             {
 
                 FileList sourceFL = (FileList)enumSourceLists.nextElement();
-                String[] sourceFiles = sourceFL.getFiles( project );
+                String[] sourceFiles = sourceFL.getFiles( getProject() );
 
                 int i = 0;
                 do
                 {
-                    File src = new File( sourceFL.getDir( project ), sourceFiles[ i ] );
+                    File src = new File( sourceFL.getDir( getProject() ), sourceFiles[ i ] );
 
                     if( src.lastModified() > now )
                     {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java
index 17b89b25f..9b24ebba3 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java
@@ -108,7 +108,7 @@ public class Echo extends Task
     public void addText( String msg )
         throws TaskException
     {
-        message += project.replaceProperties( msg );
+        message += getProject().replaceProperties( msg );
     }
 
     /**
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 a1e719ad1..ebf00a749 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
@@ -122,7 +122,7 @@ public class ExecuteOn extends ExecTask
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        mapperElement = new Mapper( project );
+        mapperElement = new Mapper( getProject() );
         return mapperElement;
     }
 
@@ -385,8 +385,8 @@ public class ExecuteOn extends ExecTask
             for( int i = 0; i < filesets.size(); i++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( i );
-                File base = fs.getDir( project );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                File base = fs.getDir( getProject() );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
 
                 if( !"dir".equals( type ) )
                 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java
index 909cf3c07..26f4508d4 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Expand.java
@@ -132,8 +132,8 @@ public class Expand extends MatchingTask
             for( int j = 0; j < filesets.size(); j++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( j );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
-                File fromDir = fs.getDir( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+                File fromDir = fs.getDir( getProject() );
 
                 String[] files = ds.getIncludedFiles();
                 for( int i = 0; i < files.length; ++i )
@@ -201,7 +201,7 @@ public class Expand extends MatchingTask
             for( int v = 0; v < patternsets.size(); v++ )
             {
                 PatternSet p = (PatternSet)patternsets.elementAt( v );
-                String[] incls = p.getIncludePatterns( project );
+                String[] incls = p.getIncludePatterns( getProject() );
                 if( incls != null )
                 {
                     for( int w = 0; w < incls.length; w++ )
@@ -214,7 +214,7 @@ public class Expand extends MatchingTask
                         }
                     }
                 }
-                String[] excls = p.getExcludePatterns( project );
+                String[] excls = p.getExcludePatterns( getProject() );
                 if( excls != null )
                 {
                     for( int w = 0; w < excls.length; w++ )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Filter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Filter.java
index d8ac808ad..ebc095912 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Filter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Filter.java
@@ -57,7 +57,7 @@ public class Filter extends Task
 
         if( isSingleFilter )
         {
-            project.getGlobalFilterSet().addFilter( token, value );
+            getProject().getGlobalFilterSet().addFilter( token, value );
         }
 
         if( isFiltersFromFile )
@@ -70,6 +70,6 @@ public class Filter extends Task
         throws TaskException
     {
         log( "Reading filters from " + filtersFile, Project.MSG_VERBOSE );
-        project.getGlobalFilterSet().readFiltersFromFile( filtersFile );
+        getProject().getGlobalFilterSet().readFiltersFromFile( filtersFile );
     }
 }
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 40e362cf3..7ef6352d0 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
@@ -140,7 +140,7 @@ public class GenerateKey
     public void execute()
         throws TaskException
     {
-        if( project.getJavaVersion().equals( Project.JAVA_1_1 ) )
+        if( getProject().getJavaVersion().equals( Project.JAVA_1_1 ) )
         {
             throw new TaskException( "The genkey task is only available on JDK" +
                                      " versions 1.2 or greater" );
@@ -162,7 +162,7 @@ public class GenerateKey
         }
 
         getLogger().info( "Generating Key for " + alias );
-        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+        final ExecTask cmd = (ExecTask)getProject().createTask( "exec" );
         cmd.setExecutable( "keytool" );
 
         cmd.createArg().setValue( "-genkey " );
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 b5f67a6e2..fb9caa95d 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
@@ -95,7 +95,7 @@ public class Get extends Task
      */
     public void setUseTimestamp( boolean v )
     {
-        if( project.getJavaVersion() != Project.JAVA_1_1 )
+        if( getProject().getJavaVersion() != Project.JAVA_1_1 )
         {
             useTimestamp = v;
         }
@@ -300,9 +300,9 @@ public class Get extends Task
         throws TaskException
     {
 
-        if( project.getJavaVersion() != Project.JAVA_1_1 )
+        if( getProject().getJavaVersion() != Project.JAVA_1_1 )
         {
-            Touch touch = (Touch)project.createTask( "touch" );
+            Touch touch = (Touch)getProject().createTask( "touch" );
             touch.setFile( file );
             touch.setMillis( timemillis );
             touch.touch();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
index 6a11e80a0..0aa20f30e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java
@@ -89,7 +89,7 @@ public class Input extends Task
     public void addText( String msg )
         throws TaskException
     {
-        message += project.replaceProperties( msg );
+        message += getProject().replaceProperties( msg );
     }
 
     /**
@@ -143,7 +143,7 @@ public class Input extends Task
         // adopted from org.apache.tools.ant.taskdefs.Property
         if( addproperty != null )
         {
-            if( project.getProperty( addproperty ) == null )
+            if( getProject().getProperty( addproperty ) == null )
             {
                 setProperty( addproperty, input );
             }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java
index 1245ef5a3..ef0151e5d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Java.java
@@ -197,7 +197,7 @@ public class Java extends Task
     public Path createClasspath()
         throws TaskException
     {
-        return cmdl.createClasspath( project ).createPath();
+        return cmdl.createClasspath( getProject() ).createPath();
     }
 
     /**
@@ -339,7 +339,7 @@ public class Java extends Task
             try
             {
                 outStream = new PrintStream( new FileOutputStream( out ) );
-                exe.execute( project );
+                exe.execute( getProject() );
             }
             catch( IOException io )
             {
@@ -355,7 +355,7 @@ public class Java extends Task
         }
         else
         {
-            exe.execute( project );
+            exe.execute( getProject() );
         }
     }
 
@@ -385,7 +385,7 @@ public class Java extends Task
                 exe = new Execute( new PumpStreamHandler( fos ), null );
             }
 
-            exe.setAntRun( project );
+            exe.setAntRun( getProject() );
 
             if( dir == null )
             {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
index 5effa3dc5..28b47f7ee 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
@@ -646,7 +646,7 @@ public class Javac extends MatchingTask
     public boolean isForkedJavac()
     {
         return !"false".equals( fork ) ||
-            "extJavac".equals( project.getProperty( "build.compiler" ) );
+            "extJavac".equals( getProject().getProperty( "build.compiler" ) );
     }
 
     /**
@@ -659,7 +659,7 @@ public class Javac extends MatchingTask
     {
         if( bootclasspath == null )
         {
-            bootclasspath = new Path( project );
+            bootclasspath = new Path( getProject() );
         }
         return bootclasspath.createPath();
     }
@@ -674,7 +674,7 @@ public class Javac extends MatchingTask
     {
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
         return compileClasspath.createPath();
     }
@@ -702,7 +702,7 @@ public class Javac extends MatchingTask
     {
         if( extdirs == null )
         {
-            extdirs = new Path( project );
+            extdirs = new Path( getProject() );
         }
         return extdirs.createPath();
     }
@@ -717,7 +717,7 @@ public class Javac extends MatchingTask
     {
         if( src == null )
         {
-            src = new Path( project );
+            src = new Path( getProject() );
         }
         return src.createPath();
     }
@@ -870,7 +870,7 @@ public class Javac extends MatchingTask
 
     private String determineCompiler()
     {
-        String compiler = project.getProperty( "build.compiler" );
+        String compiler = getProject().getProperty( "build.compiler" );
 
         if( !"false".equals( fork ) )
         {
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 e152dfecd..db4e1dad1 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
@@ -576,7 +576,7 @@ public class Javadoc extends Task
     {
         if( bootclasspath == null )
         {
-            bootclasspath = new Path( project );
+            bootclasspath = new Path( getProject() );
         }
         return bootclasspath.createPath();
     }
@@ -586,7 +586,7 @@ public class Javadoc extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -616,7 +616,7 @@ public class Javadoc extends Task
     {
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
         }
         return sourcePath.createPath();
     }
@@ -918,7 +918,7 @@ public class Javadoc extends Task
         JavadocOutputStream out = new JavadocOutputStream( Project.MSG_INFO );
         JavadocOutputStream err = new JavadocOutputStream( Project.MSG_WARN );
         Execute exe = new Execute( new PumpStreamHandler( out, err ) );
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
 
         /*
          * No reason to change the working directory as all filenames and
@@ -971,7 +971,7 @@ public class Javadoc extends Task
     protected String expand( String content )
         throws TaskException
     {
-        return project.replaceProperties( content );
+        return getProject().replaceProperties( content );
     }
 
     private String getJavadocExecutableName()
@@ -1130,7 +1130,7 @@ public class Javadoc extends Task
                 File source = resolveFile( list[ j ] );
                 fs.setDir( source );
 
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] packageDirs = ds.getIncludedDirectories();
 
                 for( int i = 0; i < packageDirs.length; i++ )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
index fe4031107..bcb14e657 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/MatchingTask.java
@@ -157,7 +157,7 @@ public abstract class MatchingTask extends Task
     {
         fileset.setDir( baseDir );
         fileset.setDefaultexcludes( useDefaultExcludes );
-        return fileset.getDirectoryScanner( project );
+        return fileset.getDirectoryScanner( getProject() );
     }
 
 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
index 63c9ec2b7..f9363dacb 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java
@@ -131,7 +131,7 @@ public class Property extends Task
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
@@ -195,7 +195,7 @@ public class Property extends Task
             String name = (String)e.nextElement();
             String value = (String)props.getProperty( name );
 
-            String v = project.replaceProperties( value );
+            String v = getProject().replaceProperties( value );
             addProperty( name, v );
         }
     }
@@ -278,7 +278,7 @@ public class Property extends Task
 
             if( classpath != null )
             {
-                cL = new AntClassLoader( project, classpath );
+                cL = new AntClassLoader( getProject(), classpath );
             }
             else
             {
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 88eb97f8b..5b4ddb0da 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
@@ -502,7 +502,7 @@ public class Rmic extends MatchingTask
     {
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
         return compileClasspath.createPath();
     }
@@ -517,7 +517,7 @@ public class Rmic extends MatchingTask
     {
         if( extdirs == null )
         {
-            extdirs = new Path( project );
+            extdirs = new Path( getProject() );
         }
         return extdirs.createPath();
     }
@@ -539,14 +539,14 @@ public class Rmic extends MatchingTask
             log( "Verify has been turned on.", Project.MSG_INFO );
         }
 
-        String compiler = project.getProperty( "build.rmic" );
+        String compiler = getProject().getProperty( "build.rmic" );
         RmicAdapter adapter = RmicAdapterFactory.getRmic( compiler, this );
 
         // now we need to populate the compiler adapter
         adapter.setRmic( this );
 
         Path classpath = adapter.getClasspath();
-        loader = new AntClassLoader( project, classpath );
+        loader = new AntClassLoader( getProject(), classpath );
 
         // scan base dirs to build up compile lists only if a
         // specific classname is not given
@@ -684,7 +684,7 @@ public class Rmic extends MatchingTask
             {
                 if( filtering )
                 {
-                    final FilterSetCollection filters = new FilterSetCollection( project.getGlobalFilterSet() );
+                    final FilterSetCollection filters = new FilterSetCollection( getProject().getGlobalFilterSet() );
                     FileUtils.copyFile( oldFile, newFile, filters );
                 }
                 else
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java
index f13e8fd86..fec15b3ee 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java
@@ -370,7 +370,7 @@ public class SQLExec extends Task
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
@@ -410,8 +410,8 @@ public class SQLExec extends Task
             for( int i = 0; i < filesets.size(); i++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( i );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
-                File srcDir = fs.getDir( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+                File srcDir = fs.getDir( getProject() );
 
                 String[] srcFiles = ds.getIncludedFiles();
 
@@ -459,7 +459,7 @@ public class SQLExec extends Task
                 log( "Loading " + driver + " using AntClassLoader with classpath " + classpath,
                      Project.MSG_VERBOSE );
 
-                loader = new AntClassLoader( project, classpath );
+                loader = new AntClassLoader( getProject(), classpath );
                 dc = loader.loadClass( driver );
             }
             else
@@ -754,7 +754,7 @@ public class SQLExec extends Task
             while( ( line = in.readLine() ) != null )
             {
                 line = line.trim();
-                line = project.replaceProperties( line );
+                line = getProject().replaceProperties( line );
                 if( line.startsWith( "//" ) )
                     continue;
                 if( line.startsWith( "--" ) )
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 4128a9b5f..70f8c1c24 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
@@ -155,11 +155,11 @@ public class SignJar extends Task
             for( int i = 0; i < filesets.size(); i++ )
             {
                 FileSet fs = (FileSet)filesets.elementAt( i );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] jarFiles = ds.getIncludedFiles();
                 for( int j = 0; j < jarFiles.length; j++ )
                 {
-                    doOneJar( new File( fs.getDir( project ), jarFiles[ j ] ), null );
+                    doOneJar( new File( fs.getDir( getProject() ), jarFiles[ j ] ), null );
                 }
             }
         }
@@ -249,7 +249,7 @@ public class SignJar extends Task
     private void doOneJar( File jarSource, File jarTarget )
         throws TaskException
     {
-        if( project.getJavaVersion().equals( Project.JAVA_1_1 ) )
+        if( getProject().getJavaVersion().equals( Project.JAVA_1_1 ) )
         {
             throw new TaskException( "The signjar task is only available on JDK versions 1.2 or greater" );
         }
@@ -269,7 +269,7 @@ public class SignJar extends Task
 
         final StringBuffer sb = new StringBuffer();
 
-        final ExecTask cmd = (ExecTask)project.createTask( "exec" );
+        final ExecTask cmd = (ExecTask)getProject().createTask( "exec" );
         cmd.setExecutable( "jarsigner" );
 
         if( null != keystore )
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 e736f4fe2..9899ad7c9 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
@@ -145,7 +145,7 @@ public class Tar
         for( Enumeration e = filesets.elements(); e.hasMoreElements(); )
         {
             TarFileSet fs = (TarFileSet)e.nextElement();
-            String[] files = fs.getFiles( project );
+            String[] files = fs.getFiles( getProject() );
 
             if( !archiveIsUpToDate( files ) )
             {
@@ -154,7 +154,7 @@ public class Tar
 
             for( int i = 0; i < files.length; ++i )
             {
-                if( tarFile.equals( new File( fs.getDir( project ), files[ i ] ) ) )
+                if( tarFile.equals( new File( fs.getDir( getProject() ), files[ i ] ) ) )
                 {
                     throw new TaskException( "A tar file cannot include itself" );
                 }
@@ -194,10 +194,10 @@ public class Tar
             for( Enumeration e = filesets.elements(); e.hasMoreElements(); )
             {
                 TarFileSet fs = (TarFileSet)e.nextElement();
-                String[] files = fs.getFiles( project );
+                String[] files = fs.getFiles( getProject() );
                 for( int i = 0; i < files.length; i++ )
                 {
-                    File f = new File( fs.getDir( project ), files[ i ] );
+                    File f = new File( fs.getDir( getProject() ), files[ i ] );
                     String name = files[ i ].replace( File.separatorChar, '/' );
                     tarFile( f, tOut, name, fs );
                 }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java
index 2fe39ed33..fe525745a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Touch.java
@@ -148,7 +148,7 @@ public class Touch extends Task
             }
         }
 
-        if( millis >= 0 && project.getJavaVersion() == Project.JAVA_1_1 )
+        if( millis >= 0 && getProject().getJavaVersion() == Project.JAVA_1_1 )
         {
             log( "modification time of files cannot be set in JDK 1.1",
                  Project.MSG_WARN );
@@ -171,8 +171,8 @@ public class Touch extends Task
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
-            File fromDir = fs.getDir( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+            File fromDir = fs.getDir( getProject() );
 
             String[] srcFiles = ds.getIncludedFiles();
             String[] srcDirs = ds.getIncludedDirectories();
@@ -202,7 +202,7 @@ public class Touch extends Task
             throw new TaskException( "Can not change modification date of read-only file " + file );
         }
 
-        if( project.getJavaVersion() == Project.JAVA_1_1 )
+        if( getProject().getJavaVersion() == Project.JAVA_1_1 )
         {
             return;
         }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
index bd4439c6d..7db444e12 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -73,7 +73,7 @@ public class Tstamp extends Task
             while( i.hasMoreElements() )
             {
                 CustomFormat cts = (CustomFormat)i.nextElement();
-                cts.execute( project, d );
+                cts.execute( getProject(), d );
             }
 
         }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
index 21a9910e1..bc4250e2a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/UpToDate.java
@@ -97,7 +97,7 @@ public class UpToDate extends MatchingTask implements Condition
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        mapperElement = new Mapper( project );
+        mapperElement = new Mapper( getProject() );
         return mapperElement;
     }
 
@@ -128,8 +128,8 @@ public class UpToDate extends MatchingTask implements Condition
         while( upToDate && enum.hasMoreElements() )
         {
             FileSet fs = (FileSet)enum.nextElement();
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
-            upToDate = upToDate && scanDir( fs.getDir( project ),
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
+            upToDate = upToDate && scanDir( fs.getDir( getProject() ),
                                             ds.getIncludedFiles() );
         }
         return upToDate;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java
index e2607fd29..8a8fb5fc9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Zip.java
@@ -266,7 +266,7 @@ public class Zip extends MatchingTask
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            dss.addElement( fs.getDirectoryScanner( project ) );
+            dss.addElement( fs.getDirectoryScanner( getProject() ) );
         }
         int dssSize = dss.size();
         FileScanner[] scanners = new FileScanner[ dssSize ];
@@ -541,7 +541,7 @@ public class Zip extends MatchingTask
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
 
             String prefix = "";
             String fullpath = "";
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java
index bdce3e39d..299b94ad2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/exec/ExecTask.java
@@ -393,7 +393,7 @@ public class ExecTask extends Task
         log( cmdl.toString(), Project.MSG_VERBOSE );
 
         Execute exe = new Execute( createHandler(), createWatchdog() );
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
         exe.setWorkingDirectory( dir );
         exe.setVMLauncher( vmLauncher );
         String[] environment = env.getVariables();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
index e1cd0f297..7e7c73021 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Copy.java
@@ -200,7 +200,7 @@ public class Copy
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        m_mapperElement = new Mapper( project );
+        m_mapperElement = new Mapper( getProject() );
         return m_mapperElement;
     }
 
@@ -249,8 +249,8 @@ public class Copy
         for( int i = 0; i < m_filesets.size(); i++ )
         {
             final FileSet fileSet = (FileSet)m_filesets.elementAt( i );
-            final DirectoryScanner scanner = fileSet.getDirectoryScanner( project );
-            final File fromDir = fileSet.getDir( project );
+            final DirectoryScanner scanner = fileSet.getDirectoryScanner( getProject() );
+            final File fromDir = fileSet.getDir( getProject() );
 
             final String[] srcFiles = scanner.getIncludedFiles();
             final String[] srcDirs = scanner.getIncludedDirectories();
@@ -419,7 +419,7 @@ public class Copy
         final FilterSetCollection executionFilters = new FilterSetCollection();
         if( m_filtering )
         {
-            executionFilters.addFilterSet( project.getGlobalFilterSet() );
+            executionFilters.addFilterSet( getProject().getGlobalFilterSet() );
         }
 
         for( final Enumeration filterEnum = m_filterSets.elements(); filterEnum.hasMoreElements(); )
@@ -506,7 +506,7 @@ public class Copy
             else
             {
                 FileSet fs = (FileSet)m_filesets.elementAt( 0 );
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] srcFiles = ds.getIncludedFiles();
 
                 if( srcFiles.length > 0 )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
index 2326c7658..b4f1a9045 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Delete.java
@@ -307,10 +307,10 @@ public class Delete
             FileSet fs = (FileSet)filesets.elementAt( i );
             try
             {
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] files = ds.getIncludedFiles();
                 String[] dirs = ds.getIncludedDirectories();
-                removeFiles( fs.getDir( project ), files, dirs );
+                removeFiles( fs.getDir( getProject() ), files, dirs );
             }
             catch( TaskException be )
             {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java
index 539e0332f..7ea0e7175 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/file/Move.java
@@ -151,7 +151,7 @@ public class Move extends Copy
                             FilterSetCollection executionFilters = new FilterSetCollection();
                             if( isFiltering() )
                             {
-                                executionFilters.addFilterSet( project.getGlobalFilterSet() );
+                                executionFilters.addFilterSet( getProject().getGlobalFilterSet() );
                             }
                             for( Enumeration filterEnum = getFilterSets().elements(); filterEnum.hasMoreElements(); )
                             {
@@ -215,7 +215,7 @@ public class Move extends Copy
             while( e.hasMoreElements() )
             {
                 FileSet fs = (FileSet)e.nextElement();
-                File dir = fs.getDir( project );
+                File dir = fs.getDir( getProject() );
 
                 if( okToDelete( dir ) )
                 {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
index 03e998e36..5711b89f9 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ANTLR.java
@@ -94,7 +94,7 @@ public class ANTLR extends Task
      */
     public Path createClasspath()
     {
-        return commandline.createClasspath( project ).createPath();
+        return commandline.createClasspath( getProject() ).createPath();
     }
 
     /**
@@ -139,7 +139,7 @@ public class ANTLR extends Task
                 ExecuteJava exe = new ExecuteJava();
                 exe.setJavaCommand( commandline.getJavaCommand() );
                 exe.setClasspath( commandline.getClasspath() );
-                exe.execute( project );
+                exe.execute( getProject() );
             }
         }
     }
@@ -229,7 +229,7 @@ public class ANTLR extends Task
     {
         Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO,
                                                          Project.MSG_WARN ), null );
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
         if( workingdir != null )
         {
             exe.setWorkingDirectory( workingdir );
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 0ca4f675f..e2362cacf 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
@@ -206,7 +206,7 @@ public class Cab extends MatchingTask
                 FileSet fs = (FileSet)filesets.elementAt( i );
                 if( fs != null )
                 {
-                    appendFiles( files, fs.getDirectoryScanner( project ) );
+                    appendFiles( files, fs.getDirectoryScanner( getProject() ) );
                 }
             }
         }
@@ -310,7 +310,7 @@ public class Cab extends MatchingTask
     protected ExecTask createExec()
         throws TaskException
     {
-        return (ExecTask)project.createTask( "exec" );
+        return (ExecTask)getProject().createTask( "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 234d798b9..73fa29015 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
@@ -721,7 +721,7 @@ public class IContract extends MatchingTask
             // Prepare the directories for iContract. iContract will make them if they
             // don't exist, but for some reason I don't know, it will complain about the REP files
             // afterwards
-            Mkdir mkdir = (Mkdir)project.createTask( "mkdir" );
+            Mkdir mkdir = (Mkdir)getProject().createTask( "mkdir" );
             mkdir.setDir( instrumentDir );
             mkdir.execute();
             mkdir.setDir( buildDir );
@@ -733,7 +733,7 @@ public class IContract extends MatchingTask
             Path baseClasspath = createClasspath();
 
             // Might need to add the core classes if we're not using Sun's Javac (like Jikes)
-            String compiler = project.getProperty( "build.compiler" );
+            String compiler = getProject().getProperty( "build.compiler" );
             ClasspathHelper classpathHelper = new ClasspathHelper( compiler );
             classpathHelper.modify( baseClasspath );
 
@@ -764,7 +764,7 @@ public class IContract extends MatchingTask
             iContractClasspath.append( new Path( getProject(), buildDir.getAbsolutePath() ) );
 
             // Create a forked java process
-            Java iContract = (Java)project.createTask( "java" );
+            Java iContract = (Java)getProject().createTask( "java" );
             iContract.setFork( true );
             iContract.setClassname( "com.reliablesystems.iContract.Tool" );
             iContract.setClasspath( iContractClasspath );
@@ -1079,8 +1079,6 @@ public class IContract extends MatchingTask
      * BuildListener that sets the iContractMissing flag to true if a message
      * about missing iContract is missing. Used to indicate a more verbose error
      * to the user, with advice about how to solve the problem
-     *
-     * @author RT
      */
     private class IContractPresenceDetector implements BuildListener
     {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java
index e47b070c0..726f8aed2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -206,7 +206,7 @@ public class Javah extends Task
     {
         if( bootclasspath == null )
         {
-            bootclasspath = new Path( project );
+            bootclasspath = new Path( getProject() );
         }
         return bootclasspath.createPath();
     }
@@ -222,7 +222,7 @@ public class Javah extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -264,7 +264,7 @@ public class Javah extends Task
             classpath = Path.systemClasspath;
         }
 
-        String compiler = project.getProperty( "build.compiler" );
+        String compiler = getProject().getProperty( "build.compiler" );
         if( compiler == null )
         {
             if( Project.getJavaVersion() != Project.JAVA_1_1 &&
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
index a86fd9e1f..526db8006 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
@@ -102,7 +102,7 @@ public class Native2Ascii extends MatchingTask
         {
             throw new TaskException( "Cannot define more than one mapper" );
         }
-        mapper = new Mapper( project );
+        mapper = new Mapper( getProject() );
         return mapper;
     }
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
index 8aaa97087..7c027b72a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java
@@ -239,11 +239,11 @@ public class ReplaceRegExp extends Task
         throws TaskException
     {
         String res = input;
-        Regexp regexp = r.getRegexp( project );
+        Regexp regexp = r.getRegexp( getProject() );
 
         if( regexp.matches( input, options ) )
         {
-            res = regexp.substitute( input, s.getExpression( project ), options );
+            res = regexp.substitute( input, s.getExpression( getProject() ), options );
         }
 
         return res;
@@ -276,7 +276,7 @@ public class ReplaceRegExp extends Task
 
             boolean changes = false;
 
-            log( "Replacing pattern '" + regex.getPattern( project ) + "' with '" + subs.getExpression( project ) +
+            log( "Replacing pattern '" + regex.getPattern( getProject() ) + "' with '" + subs.getExpression( getProject() ) +
                  "' in '" + f.getPath() + "'" +
                  ( byline ? " by line" : "" ) +
                  ( flags.length() > 0 ? " with flags: '" + flags + "'" : "" ) +
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java
index b770c3095..d19fa2389 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Rpm.java
@@ -189,7 +189,7 @@ public class Rpm extends Task
 
         Execute exe = new Execute( streamhandler, null );
 
-        exe.setAntRun( project );
+        exe.setAntRun( getProject() );
         if( topDir == null ) topDir = getBaseDirectory();
         exe.setWorkingDirectory( topDir );
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java
index 50020e2ec..f6ee2dd86 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java
@@ -86,8 +86,8 @@ public class Script extends Task
     {
         try
         {
-            addBeans( project.getProperties() );
-            addBeans( project.getReferences() );
+            addBeans( getProject().getProperties() );
+            addBeans( getProject().getReferences() );
 
             beans.put( "project", getProject() );
 
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 5c8487d27..cb875064f 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
@@ -65,7 +65,7 @@ public abstract class Continuus extends Task
      */
     public final void setCcmDir( String dir )
     {
-        _ccmDir = project.translatePath( dir );
+        _ccmDir = getProject().translatePath( dir );
     }
 
     /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
index 61d6f6825..e2f8a11d7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
@@ -62,7 +62,7 @@ public abstract class ClearCase extends Task
      */
     public final void setClearToolDir( String dir )
     {
-        m_ClearToolDir = project.translatePath( dir );
+        m_ClearToolDir = getProject().translatePath( dir );
     }
 
     /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
index c4d88840d..28147410d 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
@@ -184,7 +184,7 @@ public class Depend extends MatchingTask
     {
         if( dependClasspath == null )
         {
-            dependClasspath = new Path( project );
+            dependClasspath = new Path( getProject() );
         }
         return dependClasspath.createPath();
     }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
index 32c01cbb1..b6d5d40b7 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
@@ -422,7 +422,7 @@ public class CSharp
     {
         //demand create pathlist
         if( _referenceFiles == null )
-            _referenceFiles = new Path( this.project );
+            _referenceFiles = new Path( this.getProject() );
         _referenceFiles.append( path );
     }
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
index 97b69d5d4..caef7e82e 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
@@ -98,7 +98,7 @@ public class BorlandGenerateClient extends Task
     {
         if( this.classpath == null )
         {
-            this.classpath = new Path( project );
+            this.classpath = new Path( getProject() );
         }
         return this.classpath.createPath();
     }
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 4758d839b..3c9e44064 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
@@ -53,7 +53,7 @@ public class DDCreator extends MatchingTask
      */
     public void setClasspath( String s )
     {
-        this.classpath = project.translatePath( s );
+        this.classpath = getProject().translatePath( s );
     }
 
     /**
@@ -118,13 +118,13 @@ public class DDCreator extends MatchingTask
         }
 
         String systemClassPath = System.getProperty( "java.class.path" );
-        String execClassPath = project.translatePath( systemClassPath + ":" + classpath );
-        Java ddCreatorTask = (Java)project.createTask( "java" );
+        String execClassPath = getProject().translatePath( systemClassPath + ":" + classpath );
+        Java ddCreatorTask = (Java)getProject().createTask( "java" );
         ddCreatorTask.setFork( true );
         ddCreatorTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.DDCreatorHelper" );
         Commandline.Argument arguments = ddCreatorTask.createArg();
         arguments.setLine( args );
-        ddCreatorTask.setClasspath( new Path( project, execClassPath ) );
+        ddCreatorTask.setClasspath( new Path( getProject(), execClassPath ) );
         if( ddCreatorTask.executeJava() != 0 )
         {
             throw new TaskException( "Execution of ddcreator helper failed" );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
index be80ac4e5..fba386032 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
@@ -255,7 +255,7 @@ public class EjbJar extends MatchingTask
     {
         if( config.classpath == null )
         {
-            config.classpath = new Path( project );
+            config.classpath = new Path( getProject() );
         }
         return config.classpath.createPath();
     }
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 52dfbed03..bf5654d95 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
@@ -64,7 +64,7 @@ public class Ejbc extends MatchingTask
      */
     public void setClasspath( String s )
     {
-        this.classpath = project.translatePath( s );
+        this.classpath = getProject().translatePath( s );
     }
 
     /**
@@ -159,14 +159,14 @@ public class Ejbc extends MatchingTask
         }
 
         String systemClassPath = System.getProperty( "java.class.path" );
-        String execClassPath = project.translatePath( systemClassPath + ":" + classpath +
+        String execClassPath = getProject().translatePath( systemClassPath + ":" + classpath +
                                                       ":" + generatedFilesDirectory );
         // get all the files in the descriptor directory
         DirectoryScanner ds = super.getDirectoryScanner( descriptorDirectory );
 
         String[] files = ds.getIncludedFiles();
 
-        Java helperTask = (Java)project.createTask( "java" );
+        Java helperTask = (Java)getProject().createTask( "java" );
         helperTask.setFork( true );
         helperTask.setClassname( "org.apache.tools.ant.taskdefs.optional.ejb.EjbcHelper" );
         String args = "";
@@ -183,7 +183,7 @@ public class Ejbc extends MatchingTask
 
         Commandline.Argument arguments = helperTask.createArg();
         arguments.setLine( args );
-        helperTask.setClasspath( new Path( project, execClassPath ) );
+        helperTask.setClasspath( new Path( getProject(), execClassPath ) );
         if( helperTask.executeJava() != 0 )
         {
             throw new TaskException( "Execution of ejbc helper failed" );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
index 57397d596..1a1fba9d2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.java
@@ -176,7 +176,7 @@ public class IPlanetEjbcTask extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
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 a57035fdc..4e3db6ffd 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
@@ -237,7 +237,7 @@ public class WLRun extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -251,7 +251,7 @@ public class WLRun extends Task
     {
         if( weblogicClasspath == null )
         {
-            weblogicClasspath = new Path( project );
+            weblogicClasspath = new Path( getProject() );
         }
         return weblogicClasspath.createPath();
     }
@@ -312,7 +312,7 @@ public class WLRun extends Task
             }
         }
 
-        Java weblogicServer = (Java)project.createTask( "java" );
+        Java weblogicServer = (Java)getProject().createTask( "java" );
         weblogicServer.setFork( true );
         weblogicServer.setClassname( weblogicMainClass );
 
@@ -362,7 +362,7 @@ public class WLRun extends Task
             throw new TaskException( "You must supply a management password to start the server" );
         }
 
-        Java weblogicServer = (Java)project.createTask( "java" );
+        Java weblogicServer = (Java)getProject().createTask( "java" );
         weblogicServer.setFork( true );
         weblogicServer.setDir( weblogicSystemHome );
         weblogicServer.setClassname( weblogicMainClass );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
index f8c8d1b9b..2a0151906 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.java
@@ -120,7 +120,7 @@ public class WLStop extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath.createPath();
     }
@@ -145,7 +145,7 @@ public class WLStop extends Task
             throw new TaskException( "The url of the weblogic server must be provided." );
         }
 
-        Java weblogicAdmin = (Java)project.createTask( "java" );
+        Java weblogicAdmin = (Java)getProject().createTask( "java" );
         weblogicAdmin.setFork( true );
         weblogicAdmin.setClassname( "weblogic.Admin" );
         String args;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
index cf10679e7..778b108fd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
@@ -518,7 +518,7 @@ public class Translate extends MatchingTask
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             String[] srcFiles = ds.getIncludedFiles();
             for( int j = 0; j < srcFiles.length; j++ )
             {
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
index a31924865..5fcadc5dd 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/ide/VAJImport.java
@@ -224,7 +224,7 @@ public class VAJImport extends VAJTask
      */
     protected void importFileset( FileSet fileset )
     {
-        DirectoryScanner ds = fileset.getDirectoryScanner( this.project );
+        DirectoryScanner ds = fileset.getDirectoryScanner( this.getProject() );
         if( ds.getIncludedFiles().length == 0 )
         {
             return;
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
index bc4b7816b..fdc46a7fe 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
@@ -175,7 +175,7 @@ public class JJTree extends Task
         {
             throw new TaskException( "Javacchome not set." );
         }
-        final Path classpath = cmdl.createClasspath( project );
+        final Path classpath = cmdl.createClasspath( getProject() );
         classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
                                                "/JavaCC.zip" );
         classpath.addJavaRuntime();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
index 4a4d62de5..c36fe7688 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
@@ -225,7 +225,7 @@ public class JavaCC extends Task
         {
             throw new TaskException( "Javacchome not set." );
         }
-        final Path classpath = cmdl.createClasspath( project );
+        final Path classpath = cmdl.createClasspath( getProject() );
         classpath.createPathElement().setPath( javaccHome.getAbsolutePath() +
                                                "/JavaCC.zip" );
         classpath.addJavaRuntime();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
index f155c3a4c..c5b7a43c0 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
@@ -206,7 +206,7 @@ public class JDependTask extends Task
     {
         if( _compileClasspath == null )
         {
-            _compileClasspath = new Path( project );
+            _compileClasspath = new Path( getProject() );
         }
         return _compileClasspath.createPath();
     }
@@ -233,7 +233,7 @@ public class JDependTask extends Task
     {
         if( _sourcesPath == null )
         {
-            _sourcesPath = new Path( project );
+            _sourcesPath = new Path( getProject() );
         }
         return _sourcesPath.createPath();
     }
@@ -340,7 +340,7 @@ public class JDependTask extends Task
         if( getDir() != null )
         {
             execute.setWorkingDirectory( getDir() );
-            execute.setAntRun( project );
+            execute.setAntRun( getProject() );
         }
 
         if( getOutputFile() != null )
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
index 7fbfd1aa1..4136d0f97 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
@@ -315,7 +315,7 @@ public class JspC extends MatchingTask
         throws TaskException
     {
         if( classpath == null )
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         return classpath.createPath();
     }
 
@@ -376,7 +376,7 @@ public class JspC extends MatchingTask
 
         // compile the source files
 
-        String compiler = project.getProperty( "jsp.compiler" );
+        String compiler = getProject().getProperty( "jsp.compiler" );
         if( compiler == null )
         {
             compiler = "jasper";
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 216da4683..e26c4e873 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
@@ -127,7 +127,7 @@ public class WLJspc extends MatchingTask
     {
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
         return compileClasspath;
     }
@@ -161,7 +161,7 @@ public class WLJspc extends MatchingTask
         //use the systemclasspath as well, to include the ant jar
         if( compileClasspath == null )
         {
-            compileClasspath = new Path( project );
+            compileClasspath = new Path( getProject() );
         }
 
         compileClasspath.append( Path.systemClasspath );
@@ -171,7 +171,7 @@ public class WLJspc extends MatchingTask
         // Therefore, takes loads of time
         // Can pass directories at a time (*.jsp) but easily runs out of memory on hefty dirs
         // (even on  a Sun)
-        Java helperTask = (Java)project.createTask( "java" );
+        Java helperTask = (Java)getProject().createTask( "java" );
         helperTask.setFork( true );
         helperTask.setClassname( "weblogic.jspc" );
         String[] args = new String[ 12 ];
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 550c9d340..6fbbf4758 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -344,7 +344,7 @@ public class JUnitTask extends Task
      */
     public BatchTest createBatchTest()
     {
-        BatchTest test = new BatchTest( project );
+        BatchTest test = new BatchTest( getProject() );
         batchTests.addElement( test );
         return test;
     }
@@ -356,7 +356,7 @@ public class JUnitTask extends Task
      */
     public Path createClasspath()
     {
-        return commandline.createClasspath( project ).createPath();
+        return commandline.createClasspath( getProject() ).createPath();
     }
 
     /**
@@ -392,7 +392,7 @@ public class JUnitTask extends Task
         while( list.hasMoreElements() )
         {
             JUnitTest test = (JUnitTest)list.nextElement();
-            if( test.shouldRun( project ) )
+            if( test.shouldRun( getProject() ) )
             {
                 execute( test );
             }
@@ -655,7 +655,7 @@ public class JUnitTask extends Task
         // Create a temporary file to pass the Ant properties to the forked test
         File propsFile = new File( "junit" + ( new Random( System.currentTimeMillis() ) ).nextLong() + ".properties" );
         cmd.createArgument().setValue( "propsfile=" + propsFile.getAbsolutePath() );
-        Hashtable p = project.getProperties();
+        Hashtable p = getProject().getProperties();
         Properties props = new Properties();
         for( Enumeration enum = p.keys(); enum.hasMoreElements(); )
         {
@@ -675,7 +675,7 @@ public class JUnitTask extends Task
 
         Execute execute = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ), watchdog );
         execute.setCommandline( cmd.getCommandline() );
-        execute.setAntRun( project );
+        execute.setAntRun( getProject() );
         if( dir != null )
         {
             execute.setWorkingDirectory( dir );
@@ -710,7 +710,7 @@ public class JUnitTask extends Task
     private int executeInVM( JUnitTest test )
         throws TaskException
     {
-        test.setProperties( project.getProperties() );
+        test.setProperties( getProject().getProperties() );
         if( dir != null )
         {
             log( "dir attribute ignored if running in the same VM", Project.MSG_WARN );
@@ -730,7 +730,7 @@ public class JUnitTask extends Task
             {
                 log( "Using CLASSPATH " + classpath, Project.MSG_VERBOSE );
 
-                cl = new AntClassLoader( null, project, classpath, false );
+                cl = new AntClassLoader( null, getProject(), classpath, false );
                 // make sure the test will be accepted as a TestCase
                 cl.addSystemPackageRoot( "junit" );
                 // will cause trouble in JDK 1.1 if omitted
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
index 865c65649..35f5b9316 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
@@ -185,7 +185,7 @@ public class XMLResultAggregator extends Task implements XMLConstants
         }
         if( toDir == null )
         {
-            toDir = FileUtil.resolveFile( project.getBaseDir(), DEFAULT_DIR );
+            toDir = FileUtil.resolveFile( getProject().getBaseDir(), DEFAULT_DIR );
         }
         return new File( toDir, toFile );
     }
@@ -202,7 +202,7 @@ public class XMLResultAggregator extends Task implements XMLConstants
         for( int i = 0; i < size; i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             ds.scan();
             String[] f = ds.getIncludedFiles();
             for( int j = 0; j < f.length; j++ )
@@ -212,7 +212,7 @@ public class XMLResultAggregator extends Task implements XMLConstants
                 {
                     File file = new File( ds.getBasedir(), pathname );
                     file = FileUtil.
-                        resolveFile( project.getBaseDir(), file.getPath() );
+                        resolveFile( getProject().getBaseDir(), file.getPath() );
                     v.addElement( file );
                 }
             }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
index 94a06fb34..6db54b2ee 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
@@ -159,7 +159,7 @@ public abstract class AbstractMetamataTask extends Task
     {
         if( classPath == null )
         {
-            classPath = new Path( project );
+            classPath = new Path( getProject() );
         }
         return classPath;
     }
@@ -183,7 +183,7 @@ public abstract class AbstractMetamataTask extends Task
     {
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
         }
         return sourcePath;
     }
@@ -222,7 +222,7 @@ public abstract class AbstractMetamataTask extends Task
 
         // set the classpath as the jar file
         File jar = getMetamataJar( metamataHome );
-        final Path classPath = cmdl.createClasspath( project );
+        final Path classPath = cmdl.createClasspath( getProject() );
         classPath.createPathElement().setLocation( jar );
 
         // set the metamata.home property
@@ -374,7 +374,7 @@ public abstract class AbstractMetamataTask extends Task
         for( int i = 0; i < fileSets.size(); i++ )
         {
             FileSet fs = (FileSet)fileSets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             ds.scan();
             String[] f = ds.getIncludedFiles();
             log( i + ") Adding " + f.length + " files from directory " + ds.getBasedir(), Project.MSG_VERBOSE );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
index 89b71c7b9..89927ea6c 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
@@ -135,7 +135,7 @@ public class MAudit extends AbstractMetamataTask
     {
         if( searchPath == null )
         {
-            searchPath = new Path( project );
+            searchPath = new Path( getProject() );
         }
         return searchPath;
     }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
index 55f344c08..45af46117 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
@@ -113,7 +113,7 @@ public class MMetrics extends AbstractMetamataTask
     {
         if( path == null )
         {
-            path = new Path( project );
+            path = new Path( getProject() );
         }
         return path;
     }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
index 8f6c8e476..38bf45d6a 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
@@ -150,7 +150,7 @@ public class MParse extends Task
     {
         if( classpath == null )
         {
-            classpath = new Path( project );
+            classpath = new Path( getProject() );
         }
         return classpath;
     }
@@ -174,7 +174,7 @@ public class MParse extends Task
     {
         if( sourcepath == null )
         {
-            sourcepath = new Path( project );
+            sourcepath = new Path( getProject() );
         }
         return sourcepath;
     }
@@ -211,7 +211,7 @@ public class MParse extends Task
 
         // set the classpath as the jar files
         File[] jars = getMetamataLibs();
-        final Path classPath = cmdl.createClasspath( project );
+        final Path classPath = cmdl.createClasspath( getProject() );
         for( int i = 0; i < jars.length; i++ )
         {
             classPath.createPathElement().setLocation( jars[ i ] );
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index cceea3844..6433bbcbc 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -798,12 +798,12 @@ public class FTP
 
         if( action == SEND_FILES )
         {
-            ds = fs.getDirectoryScanner( project );
+            ds = fs.getDirectoryScanner( getProject() );
         }
         else
         {
             ds = new FTPDirectoryScanner( ftp );
-            fs.setupDirectoryScanner( ds, project );
+            fs.setupDirectoryScanner( ds, getProject() );
             ds.scan();
         }
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
index 135fba5db..0781f3d1b 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
@@ -308,7 +308,7 @@ public class MimeMail extends Task
             FileSet fs = (FileSet)filesets.elementAt( i );
             if( fs != null )
             {
-                DirectoryScanner ds = fs.getDirectoryScanner( project );
+                DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
                 String[] dsfiles = ds.getIncludedFiles();
                 File baseDir = ds.getBasedir();
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
index ae0f53b45..7fdde8ad6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
@@ -124,7 +124,7 @@ public class P4Add extends P4Base
         for( int i = 0; i < filesets.size(); i++ )
         {
             FileSet fs = (FileSet)filesets.elementAt( i );
-            DirectoryScanner ds = fs.getDirectoryScanner( project );
+            DirectoryScanner ds = fs.getDirectoryScanner( getProject() );
             //File fromDir = fs.getDir(project);
 
             String[] srcFiles = ds.getIncludedFiles();
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
index 58b5e93c6..f05edb4b2 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
@@ -100,11 +100,11 @@ public abstract class P4Base extends org.apache.tools.ant.Task
         //Get default P4 settings from environment - Mark would have done something cool with
         //introspection here.....:-)
         String tmpprop;
-        if( ( tmpprop = project.getProperty( "p4.port" ) ) != null )
+        if( ( tmpprop = getProject().getProperty( "p4.port" ) ) != null )
             setPort( tmpprop );
-        if( ( tmpprop = project.getProperty( "p4.client" ) ) != null )
+        if( ( tmpprop = getProject().getProperty( "p4.client" ) ) != null )
             setClient( tmpprop );
-        if( ( tmpprop = project.getProperty( "p4.user" ) ) != null )
+        if( ( tmpprop = getProject().getProperty( "p4.user" ) ) != null )
             setUser( tmpprop );
     }
 
@@ -167,7 +167,7 @@ public abstract class P4Base extends org.apache.tools.ant.Task
 
             Execute exe = new Execute( handler, null );
 
-            exe.setAntRun( project );
+            exe.setAntRun( getProject() );
 
             exe.setCommandline( commandline.getCommandline() );
 
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
index 7d78cbf3a..7ae4e6bdf 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
@@ -81,7 +81,7 @@ public class P4Change extends P4Base
 
         if( emptyChangeList == null )
             emptyChangeList = getEmptyChangeList();
-        final Project myProj = project;
+        final Project myProj = getProject();
 
         P4Handler handler =
             new P4HandlerAdapter()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
index 73186ec9d..f8dd136e6 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
@@ -76,7 +76,7 @@ public class P4Counter extends P4Base
 
         if( shouldSetProperty )
         {
-            final Project myProj = project;
+            final Project myProj = getProject();
 
             P4Handler handler =
                 new P4HandlerAdapter()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
index d71931254..3f3e42942 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
@@ -203,7 +203,7 @@ public class CovReport extends Task
     {
         if( coveragePath == null )
         {
-            coveragePath = new Path( project );
+            coveragePath = new Path( getProject() );
         }
         return coveragePath.createPath();
     }
@@ -221,7 +221,7 @@ public class CovReport extends Task
     {
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
         }
         return sourcePath.createPath();
     }
@@ -290,7 +290,7 @@ public class CovReport extends Task
         // as a default -sourcepath use . in JProbe, so use project .
         if( sourcePath == null )
         {
-            sourcePath = new Path( project );
+            sourcePath = new Path( getProject() );
             sourcePath.createPath().setLocation( getBaseDirectory() );
         }
         v.addElement( "-sourcepath=" + sourcePath );
@@ -364,7 +364,7 @@ public class CovReport extends Task
         {
             if( classPath == null )
             {
-                classPath = new Path( CovReport.this.project );
+                classPath = new Path( CovReport.this.getProject() );
             }
             return classPath.createPath();
         }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
index 6ca0d0ce1..d566cd128 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
@@ -229,7 +229,7 @@ public class Coverage extends Task
      */
     public Path createClasspath()
     {
-        return cmdlJava.createClasspath( project ).createPath();
+        return cmdlJava.createClasspath( getProject() ).createPath();
     }
 
     public Filters createFilters()
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 9b2228834..2441de660 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
@@ -135,7 +135,7 @@ public abstract class MSVSS extends Task
      */
     public final void setSsdir( String dir )
     {
-        m_SSDir = project.translatePath( dir );
+        m_SSDir = getProject().translatePath( dir );
     }
 
     /**
@@ -227,7 +227,7 @@ public abstract class MSVSS extends Task
                 exe.setEnvironment( newEnv );
             }
 
-            exe.setAntRun( project );
+            exe.setAntRun( getProject() );
             exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();