project.setProperty() -> setProperty()

setProperty() is inherited from AbstractTask and actually delegates to TaskContext to do the work.

project.getBaseDir() -> getBaseDirectory()

getBaseDirectory() is also inherited from AbstractTask and also delegates to TaskContext.


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

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

@@ -181,7 +181,7 @@ public class Available
             String lSep = System.getProperty( "line.separator" );
             if( null == project.getProperty( property ) )
             {
-                this.project.setProperty( property, value );
+                setProperty( property, value );
             }
             //else ignore
         }

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

@@ -288,7 +288,7 @@ public class Checksum extends MatchingTask implements Condition
                     }
                     else
                     {
-                        project.setProperty( prop, checksum );
+                        setProperty( prop, checksum );
                     }
                 }
                 else if( destination instanceof java.io.File )

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

@@ -291,8 +291,7 @@ public class Cvs extends Task
                                    null );
 
         exe.setAntRun( project );
-        if( dest == null )
-            dest = project.getBaseDir();
+        if( dest == null ) dest = getBaseDirectory();
         exe.setWorkingDirectory( dest );
 
         exe.setCommandline( toExecute.getCommandline() );

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

@@ -388,8 +388,7 @@ public class ExecTask extends Task
         throws TaskException
     {
         // default directory to the project's base directory
-        if( dir == null )
-            dir = project.getBaseDir();
+        if( dir == null ) dir = getBaseDirectory();
         // show the command
         log( cmdl.toString(), Project.MSG_VERBOSE );
 

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

@@ -145,7 +145,7 @@ public class Input extends Task
         {
             if( project.getProperty( addproperty ) == null )
             {
-                project.setProperty( addproperty, input );
+                setProperty( addproperty, input );
             }
             else
             {

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

@@ -386,7 +386,7 @@ public class Java extends Task
 
             if( dir == null )
             {
-                dir = project.getBaseDir();
+                dir = getBaseDirectory();
             }
             else if( !dir.exists() || !dir.isDirectory() )
             {

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

@@ -39,7 +39,6 @@ public class Property extends Task
     protected Reference ref;
     protected String resource;
 
-    protected boolean userProperty;
     protected String value;// set read-only properties
 
     public Property()
@@ -47,11 +46,6 @@ public class Property extends Task
         super();
     }
 
-    protected Property( boolean userProperty )
-    {
-        this.userProperty = userProperty;
-    }
-
     public void setClasspath( Path classpath )
         throws TaskException
     {
@@ -207,21 +201,7 @@ public class Property extends Task
 
     protected void addProperty( String n, String v )
     {
-        if( userProperty )
-        {
-            if( project.getUserProperty( n ) == null )
-            {
-                project.setUserProperty( n, v );
-            }
-            else
-            {
-                log( "Override ignored for " + n, Project.MSG_VERBOSE );
-            }
-        }
-        else
-        {
             project.setNewProperty( n, v );
-        }
     }
 
     protected void loadEnvironment( String prefix )

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

@@ -147,7 +147,7 @@ public class UpToDate extends MatchingTask implements Condition
         boolean upToDate = eval();
         if( upToDate )
         {
-            this.project.setProperty( _property, this.getValue() );
+            setProperty( _property, this.getValue() );
             if( mapperElement == null )
             {
                 log( "File \"" + _targetFile.getAbsolutePath() + "\" is up to date.",

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

@@ -39,8 +39,9 @@ import org.apache.tools.ant.util.FileUtils;
  * @author <a href="mailto:russgold@acm.org">Russell Gold</a>
  * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-
-public class XSLTProcess extends MatchingTask implements XSLTLogger
+public class XSLTProcess
+    extends MatchingTask
+    implements XSLTLogger
 {
 
     private File destDir = null;
@@ -67,6 +68,11 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
 
     private String processor;
 
+    public void log( String msg )
+    {
+        getLogger().info( msg );
+    }
+
     /**
      * Creates a new XSLTProcess Task.
      */
@@ -229,7 +235,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
 
         if( baseDir == null )
         {
-            baseDir = resolveFile( "." );
+            baseDir = getBaseDirectory();
         }
 
         liaison = getLiaison();

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

@@ -117,7 +117,7 @@ public class Native2Ascii extends MatchingTask
         // default srcDir to basedir
         if( srcDir == null )
         {
-            srcDir = resolveFile( "." );
+            srcDir = getBaseDirectory();
         }
 
         // Require destDir

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

@@ -190,8 +190,7 @@ public class Rpm extends Task
         Execute exe = new Execute( streamhandler, null );
 
         exe.setAntRun( project );
-        if( topDir == null )
-            topDir = project.getBaseDir();
+        if( topDir == null ) topDir = getBaseDirectory();
         exe.setWorkingDirectory( topDir );
 
         exe.setCommandline( toExecute.getCommandline() );

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

@@ -87,7 +87,6 @@ public class Script extends Task
         try
         {
             addBeans( project.getProperties() );
-            addBeans( project.getUserProperties() );
             addBeans( project.getTargets() );
             addBeans( project.getReferences() );
 

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

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

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

@@ -331,7 +331,7 @@ public class CCCheckin extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got. the format is

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

@@ -419,7 +419,7 @@ public class CCCheckout extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got the format is

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

@@ -123,7 +123,7 @@ public class CCUnCheckout extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got the format is

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

@@ -332,7 +332,7 @@ public class CCUpdate extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got the format is

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

@@ -111,7 +111,7 @@ public abstract class ClearCase extends Task
             Project aProj = getProject();
             Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) );
             exe.setAntRun( aProj );
-            exe.setWorkingDirectory( aProj.getBaseDir() );
+            exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }

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

@@ -649,8 +649,7 @@ public class CSharp
     public void execute()
         throws TaskException
     {
-        if( _srcDir == null )
-            _srcDir = resolveFile( "." );
+        if( _srcDir == null ) _srcDir = getBaseDirectory();
 
         NetCommand command = new NetCommand( this, "CSC", csc_exe_name );
         command.setFailOnError( getFailFailOnError() );

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

@@ -306,8 +306,7 @@ public class Ilasm
     public void execute()
         throws TaskException
     {
-        if( _srcDir == null )
-            _srcDir = resolveFile( "." );
+        if( _srcDir == null ) _srcDir = getBaseDirectory();
 
         //get dependencies list.
         DirectoryScanner scanner = super.getDirectoryScanner( _srcDir );

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

@@ -200,7 +200,7 @@ public class NetCommand
         throws TaskException
     {
         // default directory to the project's base directory
-        File dir = _owner.getProject().getBaseDir();
+        File dir = _owner.getBaseDirectory();
         ExecuteStreamHandler handler = new LogStreamHandler( _owner,
                                                              Project.MSG_INFO, Project.MSG_WARN );
         _exe = new Execute( handler, null );

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

@@ -416,8 +416,9 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
      */
     private void generateClient( File sourceJar )
     {
-        getTask().getProject().addTaskDefinition( "internal_bas_generateclient",
-                                                  org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
+        //UGLY HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        //getTask().getProject().addTaskDefinition( "internal_bas_generateclient",
+       //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
 
         org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient gentask = null;
         log( "generate client for " + sourceJar, Project.MSG_INFO );

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

@@ -215,12 +215,12 @@ public class AggregateTransformer
         // set the destination directory relative from the project if needed.
         if( toDir == null )
         {
-            toDir = FileUtils.newFileUtils().resolveFile( task.getProject().getBaseDir(), "." );
+            toDir = FileUtils.newFileUtils().resolveFile( task.getBaseDirectory(), "." );
         }
         else if( !toDir.isAbsolute() )
         {
             toDir = FileUtils.newFileUtils().
-                resolveFile( task.getProject().getBaseDir(), toDir.getPath() );
+                resolveFile( task.getBaseDirectory(), toDir.getPath() );
         }
     }
 

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

@@ -524,7 +524,7 @@ public class JUnitTask extends Task
         //@todo should be moved to the test class instead.
         if( test.getTodir() == null )
         {
-            test.setTodir( resolveFile( "." ) );
+            test.setTodir( getBaseDirectory() );
         }
 
         if( test.getOutfile() == null )
@@ -568,11 +568,11 @@ public class JUnitTask extends Task
                      + ( wasKilled ? " (timeout)" : "" ), Project.MSG_ERR );
                 if( errorOccurredHere && test.getErrorProperty() != null )
                 {
-                    project.setProperty( test.getErrorProperty(), "true" );
+                    setProperty( test.getErrorProperty(), "true" );
                 }
                 if( failureOccurredHere && test.getFailureProperty() != null )
                 {
-                    project.setProperty( test.getFailureProperty(), "true" );
+                    setProperty( test.getFailureProperty(), "true" );
                 }
             }
         }

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

@@ -96,7 +96,7 @@ public class P4Change extends P4Base
 
                         int changenumber = Integer.parseInt( line );
                         log( "Change Number is " + changenumber, Project.MSG_INFO );
-                        myProj.setProperty( "p4.change", "" + changenumber );
+                        setProperty( "p4.change", "" + changenumber );
 
                     }
                     else if( util.match( "/error/", line ) )

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

@@ -87,7 +87,7 @@ public class P4Counter extends P4Base
                         try
                         {
                             value = Integer.parseInt( line );
-                            myProj.setProperty( property, "" + value );
+                            setProperty( property, "" + value );
                         }
                         catch( NumberFormatException nfe )
                         {

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

@@ -453,7 +453,7 @@ public class Pvcs extends org.apache.tools.ant.Task
             Project aProj = getProject();
             Execute exe = new Execute( out );
             exe.setAntRun( aProj );
-            exe.setWorkingDirectory( aProj.getBaseDir() );
+            exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }

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

@@ -291,7 +291,7 @@ public class CovReport extends Task
         if( sourcePath == null )
         {
             sourcePath = new Path( project );
-            sourcePath.createPath().setLocation( resolveFile( "." ) );
+            sourcePath.createPath().setLocation( getBaseDirectory() );
         }
         v.addElement( "-sourcepath=" + sourcePath );
 

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

@@ -228,7 +228,7 @@ public abstract class MSVSS extends Task
             }
 
             exe.setAntRun( project );
-            exe.setWorkingDirectory( project.getBaseDir() );
+            exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }

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

@@ -181,7 +181,7 @@ public class Available
             String lSep = System.getProperty( "line.separator" );
             if( null == project.getProperty( property ) )
             {
-                this.project.setProperty( property, value );
+                setProperty( property, value );
             }
             //else ignore
         }

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

@@ -288,7 +288,7 @@ public class Checksum extends MatchingTask implements Condition
                     }
                     else
                     {
-                        project.setProperty( prop, checksum );
+                        setProperty( prop, checksum );
                     }
                 }
                 else if( destination instanceof java.io.File )

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

@@ -291,8 +291,7 @@ public class Cvs extends Task
                                    null );
 
         exe.setAntRun( project );
-        if( dest == null )
-            dest = project.getBaseDir();
+        if( dest == null ) dest = getBaseDirectory();
         exe.setWorkingDirectory( dest );
 
         exe.setCommandline( toExecute.getCommandline() );

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

@@ -388,8 +388,7 @@ public class ExecTask extends Task
         throws TaskException
     {
         // default directory to the project's base directory
-        if( dir == null )
-            dir = project.getBaseDir();
+        if( dir == null ) dir = getBaseDirectory();
         // show the command
         log( cmdl.toString(), Project.MSG_VERBOSE );
 

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

@@ -145,7 +145,7 @@ public class Input extends Task
         {
             if( project.getProperty( addproperty ) == null )
             {
-                project.setProperty( addproperty, input );
+                setProperty( addproperty, input );
             }
             else
             {

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

@@ -386,7 +386,7 @@ public class Java extends Task
 
             if( dir == null )
             {
-                dir = project.getBaseDir();
+                dir = getBaseDirectory();
             }
             else if( !dir.exists() || !dir.isDirectory() )
             {

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

@@ -39,7 +39,6 @@ public class Property extends Task
     protected Reference ref;
     protected String resource;
 
-    protected boolean userProperty;
     protected String value;// set read-only properties
 
     public Property()
@@ -47,11 +46,6 @@ public class Property extends Task
         super();
     }
 
-    protected Property( boolean userProperty )
-    {
-        this.userProperty = userProperty;
-    }
-
     public void setClasspath( Path classpath )
         throws TaskException
     {
@@ -207,21 +201,7 @@ public class Property extends Task
 
     protected void addProperty( String n, String v )
     {
-        if( userProperty )
-        {
-            if( project.getUserProperty( n ) == null )
-            {
-                project.setUserProperty( n, v );
-            }
-            else
-            {
-                log( "Override ignored for " + n, Project.MSG_VERBOSE );
-            }
-        }
-        else
-        {
             project.setNewProperty( n, v );
-        }
     }
 
     protected void loadEnvironment( String prefix )

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

@@ -147,7 +147,7 @@ public class UpToDate extends MatchingTask implements Condition
         boolean upToDate = eval();
         if( upToDate )
         {
-            this.project.setProperty( _property, this.getValue() );
+            setProperty( _property, this.getValue() );
             if( mapperElement == null )
             {
                 log( "File \"" + _targetFile.getAbsolutePath() + "\" is up to date.",

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

@@ -39,8 +39,9 @@ import org.apache.tools.ant.util.FileUtils;
  * @author <a href="mailto:russgold@acm.org">Russell Gold</a>
  * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-
-public class XSLTProcess extends MatchingTask implements XSLTLogger
+public class XSLTProcess
+    extends MatchingTask
+    implements XSLTLogger
 {
 
     private File destDir = null;
@@ -67,6 +68,11 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
 
     private String processor;
 
+    public void log( String msg )
+    {
+        getLogger().info( msg );
+    }
+
     /**
      * Creates a new XSLTProcess Task.
      */
@@ -229,7 +235,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger
 
         if( baseDir == null )
         {
-            baseDir = resolveFile( "." );
+            baseDir = getBaseDirectory();
         }
 
         liaison = getLiaison();

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

@@ -117,7 +117,7 @@ public class Native2Ascii extends MatchingTask
         // default srcDir to basedir
         if( srcDir == null )
         {
-            srcDir = resolveFile( "." );
+            srcDir = getBaseDirectory();
         }
 
         // Require destDir

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

@@ -190,8 +190,7 @@ public class Rpm extends Task
         Execute exe = new Execute( streamhandler, null );
 
         exe.setAntRun( project );
-        if( topDir == null )
-            topDir = project.getBaseDir();
+        if( topDir == null ) topDir = getBaseDirectory();
         exe.setWorkingDirectory( topDir );
 
         exe.setCommandline( toExecute.getCommandline() );

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

@@ -87,7 +87,6 @@ public class Script extends Task
         try
         {
             addBeans( project.getProperties() );
-            addBeans( project.getUserProperties() );
             addBeans( project.getTargets() );
             addBeans( project.getReferences() );
 

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

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

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

@@ -331,7 +331,7 @@ public class CCCheckin extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got. the format is

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

@@ -419,7 +419,7 @@ public class CCCheckout extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got the format is

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

@@ -123,7 +123,7 @@ public class CCUnCheckout extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got the format is

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

@@ -332,7 +332,7 @@ public class CCUpdate extends ClearCase
         // Default the viewpath to basedir if it is not specified
         if( getViewPath() == null )
         {
-            setViewPath( aProj.getBaseDir().getPath() );
+            setViewPath( getBaseDirectory().getPath() );
         }
 
         // build the command line from what we got the format is

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

@@ -111,7 +111,7 @@ public abstract class ClearCase extends Task
             Project aProj = getProject();
             Execute exe = new Execute( new LogStreamHandler( this, Project.MSG_INFO, Project.MSG_WARN ) );
             exe.setAntRun( aProj );
-            exe.setWorkingDirectory( aProj.getBaseDir() );
+            exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }

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

@@ -649,8 +649,7 @@ public class CSharp
     public void execute()
         throws TaskException
     {
-        if( _srcDir == null )
-            _srcDir = resolveFile( "." );
+        if( _srcDir == null ) _srcDir = getBaseDirectory();
 
         NetCommand command = new NetCommand( this, "CSC", csc_exe_name );
         command.setFailOnError( getFailFailOnError() );

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

@@ -306,8 +306,7 @@ public class Ilasm
     public void execute()
         throws TaskException
     {
-        if( _srcDir == null )
-            _srcDir = resolveFile( "." );
+        if( _srcDir == null ) _srcDir = getBaseDirectory();
 
         //get dependencies list.
         DirectoryScanner scanner = super.getDirectoryScanner( _srcDir );

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

@@ -200,7 +200,7 @@ public class NetCommand
         throws TaskException
     {
         // default directory to the project's base directory
-        File dir = _owner.getProject().getBaseDir();
+        File dir = _owner.getBaseDirectory();
         ExecuteStreamHandler handler = new LogStreamHandler( _owner,
                                                              Project.MSG_INFO, Project.MSG_WARN );
         _exe = new Execute( handler, null );

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

@@ -416,8 +416,9 @@ public class BorlandDeploymentTool extends GenericDeploymentTool implements Exec
      */
     private void generateClient( File sourceJar )
     {
-        getTask().getProject().addTaskDefinition( "internal_bas_generateclient",
-                                                  org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
+        //UGLY HACK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+        //getTask().getProject().addTaskDefinition( "internal_bas_generateclient",
+       //org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient.class );
 
         org.apache.tools.ant.taskdefs.optional.ejb.BorlandGenerateClient gentask = null;
         log( "generate client for " + sourceJar, Project.MSG_INFO );

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

@@ -215,12 +215,12 @@ public class AggregateTransformer
         // set the destination directory relative from the project if needed.
         if( toDir == null )
         {
-            toDir = FileUtils.newFileUtils().resolveFile( task.getProject().getBaseDir(), "." );
+            toDir = FileUtils.newFileUtils().resolveFile( task.getBaseDirectory(), "." );
         }
         else if( !toDir.isAbsolute() )
         {
             toDir = FileUtils.newFileUtils().
-                resolveFile( task.getProject().getBaseDir(), toDir.getPath() );
+                resolveFile( task.getBaseDirectory(), toDir.getPath() );
         }
     }
 

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

@@ -524,7 +524,7 @@ public class JUnitTask extends Task
         //@todo should be moved to the test class instead.
         if( test.getTodir() == null )
         {
-            test.setTodir( resolveFile( "." ) );
+            test.setTodir( getBaseDirectory() );
         }
 
         if( test.getOutfile() == null )
@@ -568,11 +568,11 @@ public class JUnitTask extends Task
                      + ( wasKilled ? " (timeout)" : "" ), Project.MSG_ERR );
                 if( errorOccurredHere && test.getErrorProperty() != null )
                 {
-                    project.setProperty( test.getErrorProperty(), "true" );
+                    setProperty( test.getErrorProperty(), "true" );
                 }
                 if( failureOccurredHere && test.getFailureProperty() != null )
                 {
-                    project.setProperty( test.getFailureProperty(), "true" );
+                    setProperty( test.getFailureProperty(), "true" );
                 }
             }
         }

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

@@ -96,7 +96,7 @@ public class P4Change extends P4Base
 
                         int changenumber = Integer.parseInt( line );
                         log( "Change Number is " + changenumber, Project.MSG_INFO );
-                        myProj.setProperty( "p4.change", "" + changenumber );
+                        setProperty( "p4.change", "" + changenumber );
 
                     }
                     else if( util.match( "/error/", line ) )

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

@@ -87,7 +87,7 @@ public class P4Counter extends P4Base
                         try
                         {
                             value = Integer.parseInt( line );
-                            myProj.setProperty( property, "" + value );
+                            setProperty( property, "" + value );
                         }
                         catch( NumberFormatException nfe )
                         {

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

@@ -453,7 +453,7 @@ public class Pvcs extends org.apache.tools.ant.Task
             Project aProj = getProject();
             Execute exe = new Execute( out );
             exe.setAntRun( aProj );
-            exe.setWorkingDirectory( aProj.getBaseDir() );
+            exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }

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

@@ -291,7 +291,7 @@ public class CovReport extends Task
         if( sourcePath == null )
         {
             sourcePath = new Path( project );
-            sourcePath.createPath().setLocation( resolveFile( "." ) );
+            sourcePath.createPath().setLocation( getBaseDirectory() );
         }
         v.addElement( "-sourcepath=" + sourcePath );
 

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

@@ -228,7 +228,7 @@ public abstract class MSVSS extends Task
             }
 
             exe.setAntRun( project );
-            exe.setWorkingDirectory( project.getBaseDir() );
+            exe.setWorkingDirectory( getBaseDirectory() );
             exe.setCommandline( cmd.getCommandline() );
             return exe.execute();
         }