ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types FilterSet.java SourceFileScanner.java
Date Mon, 11 Mar 2002 08:41:36 GMT
adammurdoch    02/03/11 00:41:36

  Modified:    proposal/myrmidon/src/java/org/apache/antlib/archive
                        Pack.java Unpack.java
               proposal/myrmidon/src/java/org/apache/antlib/build
                        Checksum.java SleepTask.java
               proposal/myrmidon/src/java/org/apache/antlib/core
                        LoadProperties.java Log.java
               proposal/myrmidon/src/java/org/apache/antlib/cvslib
                        CVSPass.java
               proposal/myrmidon/src/java/org/apache/antlib/dotnet
                        CSharp.java Ilasm.java
               proposal/myrmidon/src/java/org/apache/antlib/file
                        CopyTask.java Delete.java FilteredCopyTask.java
                        Mkdir.java Touch.java
               proposal/myrmidon/src/java/org/apache/antlib/nativelib
                        Exec.java LoadEnvironment.java
               proposal/myrmidon/src/java/org/apache/antlib/security
                        GenerateKey.java SignJar.java
               proposal/myrmidon/src/java/org/apache/antlib/selftest
                        PrimitiveTypesTest.java
               proposal/myrmidon/src/java/org/apache/antlib/sound
                        SoundTask.java
               proposal/myrmidon/src/java/org/apache/antlib/vfile
                        CopyFilesTask.java ListFileSetTask.java
                        ListFilesTask.java
               proposal/myrmidon/src/java/org/apache/antlib/xml
                        LocalResolver.java ValidatorErrorHandler.java
                        XMLValidateTask.java XSLTProcess.java
               proposal/myrmidon/src/java/org/apache/myrmidon/api
                        AbstractTask.java TaskContext.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
                        AspectAwareExecutor.java DefaultExecutor.java
                        Resources.properties
               proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace
                        DefaultTaskContext.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        DependSet.java Filter.java Get.java Java.java
                        PathConvert.java Property.java SQLExec.java
                        UpToDate.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive
                        Ear.java Expand.java Jar.java Tar.java War.java
                        Zip.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
                        Javac.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition
                        Http.java Socket.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc
                        Javadoc.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
                        ANTLR.java Cab.java ClassArgument.java
                        IContract.java Javah.java NetRexxC.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        CCMCreateTask.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n
                        Translate.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
                        JJTree.java JavaCC.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
                        JDependTask.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp
                        JspC.java WLJspc.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
                        JUnitTask.java XMLResultAggregator.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        AbstractMetamataTask.java MAudit.java MMetrics.java
                        MMetricsStreamHandler.java MParse.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net
                        FTP.java MimeMail.java TelnetTask.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
                        P4Add.java P4Base.java P4Change.java P4Counter.java
                        P4Label.java P4Submit.java P4Sync.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm
                        AntStarTeamCheckOut.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
                        CovMerge.java CovReport.java Coverage.java
                        XMLReport.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSSCHECKIN.java MSVSSCHECKOUT.java MSVSSGET.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic
                        Rmic.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text
                        FixCRLF.java Native2Ascii.java Replace.java
                        ReplaceRegExp.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix
                        Rpm.java
               proposal/myrmidon/src/main/org/apache/tools/ant/types
                        FilterSet.java SourceFileScanner.java
  Added:       proposal/myrmidon/src/java/org/apache/myrmidon/api
                        LogLevel.java
  Removed:     proposal/myrmidon/src/java/org/apache/myrmidon/framework
                        LogLevel.java
  Log:
  * AbstractTask no longer extends AbstractLogEnabled.
  * DefaultExecutor no longer log enables Tasks.
  * Added TaskContext.log( LogLevel, ... ) methods.
  * Moved LogLevel to myrmidon.api package.
  
  Revision  Changes    Path
  1.5       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java
  
  Index: Pack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Pack.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Pack.java	6 Feb 2002 13:31:39 -0000	1.4
  +++ Pack.java	11 Mar 2002 08:41:30 -0000	1.5
  @@ -15,6 +15,7 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Abstract Base class for pack tasks.
  @@ -43,7 +44,7 @@
       {
           validate();
           final String message = "Building: " + m_zipFile.getAbsolutePath();
  -        getLogger().info( message );
  +        getContext().info( message );
           pack();
       }
   
  
  
  
  1.3       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java
  
  Index: Unpack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/archive/Unpack.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Unpack.java	3 Feb 2002 03:37:48 -0000	1.2
  +++ Unpack.java	11 Mar 2002 08:41:30 -0000	1.3
  @@ -16,6 +16,7 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Abstract Base class for unpack tasks.
  @@ -52,7 +53,7 @@
           {
               final String message = "Expanding " + src.getAbsolutePath() +
                   " to " + dest.getAbsolutePath();
  -            getLogger().info( message );
  +            getContext().info( message );
   
               extract();
           }
  
  
  
  1.5       +6 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java
  
  Index: Checksum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Checksum.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Checksum.java	18 Feb 2002 08:28:51 -0000	1.4
  +++ Checksum.java	11 Mar 2002 08:41:31 -0000	1.5
  @@ -21,6 +21,8 @@
   import java.util.Hashtable;
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.AbstractMatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -32,7 +34,7 @@
    *
    * @ant:task name="checksum"
    * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  - * @version $Revision: 1.4 $ $Date: 2002/02/18 08:28:51 $
  + * @version $Revision: 1.5 $ $Date: 2002/03/11 08:41:31 $
    */
   public class Checksum
       extends AbstractMatchingTask
  @@ -195,7 +197,7 @@
                       {
                           final String message = file + " omitted as " + dest +
                               " is up to date.";
  -                        getLogger().debug( message );
  +                        getContext().debug( message );
                       }
                   }
                   else
  @@ -207,7 +209,7 @@
               {
                   final String message = "Could not find file " + file.getAbsolutePath() +
                       " to generate checksum for.";
  -                getLogger().info( message );
  +                getContext().info( message );
                   throw new TaskException( message );
               }
           }
  @@ -225,7 +227,7 @@
           {
               final File src = (File)includes.nextElement();
               final String message = "Calculating " + m_algorithm + " checksum for " + src;
  -            getLogger().info( message );
  +            getContext().info( message );
   
               checksumMatches = z( src, checksumMatches );
           }
  
  
  
  1.4       +3 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java
  
  Index: SleepTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/SleepTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SleepTask.java	18 Feb 2002 08:28:22 -0000	1.3
  +++ SleepTask.java	11 Mar 2002 08:41:31 -0000	1.4
  @@ -11,13 +11,14 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * A task to sleep for a period of time
    *
    * @ant:task name="sleep"
    * @author steve_l@iseran.com steve loughran
  - * @version $Revision: 1.3 $ $Date: 2002/02/18 08:28:22 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/11 08:41:31 $
    */
   public class SleepTask
       extends AbstractTask
  @@ -91,7 +92,7 @@
           final long sleepTime = getSleepTime();
   
           final String message = REZ.getString( "sleep.duration.notice", new Long( sleepTime ) );
  -        getLogger().debug( message );
  +        getContext().debug( message );
   
           doSleep( sleepTime );
       }
  
  
  
  1.7       +5 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java
  
  Index: LoadProperties.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/LoadProperties.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LoadProperties.java	18 Feb 2002 09:02:40 -0000	1.6
  +++ LoadProperties.java	11 Mar 2002 08:41:31 -0000	1.7
  @@ -16,6 +16,7 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * This task loads properties from a property file and places them in the context.
  @@ -73,18 +74,18 @@
       private void loadFile( final File file )
           throws TaskException
       {
  -        if( getLogger().isDebugEnabled() )
  +        if( getContext().isDebugEnabled() )
           {
               final String message =
                   REZ.getString( "loadprop.file.notice", file.getAbsolutePath() );
  -            getLogger().debug( message );
  +            getContext().debug( message );
           }
   
           if( !file.exists() )
           {
               final String message =
                   REZ.getString( "loadprop.missing-file.notice", file.getAbsolutePath() );
  -            getLogger().debug( message );
  +            getContext().debug( message );
           }
           else
           {
  @@ -120,7 +121,7 @@
           catch( final TaskException te )
           {
               final String message = REZ.getString( "loadprop.bad-resolve.error", name, value );
  -            getLogger().info( message, te );
  +            getContext().info( message, te );
           }
       }
   }
  
  
  
  1.9       +4 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java
  
  Index: Log.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/core/Log.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Log.java	13 Jan 2002 04:51:50 -0000	1.8
  +++ Log.java	11 Mar 2002 08:41:31 -0000	1.9
  @@ -9,7 +9,8 @@
   
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.framework.LogLevel;
  +import org.apache.myrmidon.api.TaskContext;
  +import org.apache.myrmidon.api.LogLevel;
   
   /**
    * This is a task used to log messages in the build file.
  @@ -33,7 +34,7 @@
       /**
        * Set the level at which the message will be logged.
        *
  -     * @param the level at which message will be logged
  +     * @param level the level at which message will be logged
        */
       public void setLevel( final LogLevel level )
       {
  @@ -64,7 +65,7 @@
       public void execute()
           throws TaskException
       {
  -        LogLevel.log( getLogger(), m_message, m_level );
  +        getContext().log( m_level, m_message );
       }
   
       /**
  
  
  
  1.10      +6 -5      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java
  
  Index: CVSPass.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/CVSPass.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CVSPass.java	2 Feb 2002 15:43:29 -0000	1.9
  +++ CVSPass.java	11 Mar 2002 08:41:31 -0000	1.10
  @@ -16,12 +16,13 @@
   import org.apache.avalon.excalibur.util.StringUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * CVSLogin Adds an new entry to a CVS password file
    *
    * @author <a href="jeff@custommonkey.org">Jeff Martin</a>
  - * @version $Revision: 1.9 $ $Date: 2002/02/02 15:43:29 $
  + * @version $Revision: 1.10 $ $Date: 2002/03/11 08:41:31 $
    * @ant:task name="cvs-pass"
    */
   public class CVSPass
  @@ -112,9 +113,9 @@
               throw new TaskException( "password is required" );
           }
   
  -        getLogger().debug( "cvsRoot: " + m_cvsRoot );
  -        getLogger().debug( "password: " + m_password );
  -        getLogger().debug( "passFile: " + m_passwordFile );
  +        getContext().debug( "cvsRoot: " + m_cvsRoot );
  +        getContext().debug( "password: " + m_password );
  +        getContext().debug( "passFile: " + m_passwordFile );
   
           //FIXME: Should not be writing the whole file - Just append to the file
           //Also should have EOL configurable
  @@ -142,7 +143,7 @@
               final String pwdfile =
                   sb.toString() + m_cvsRoot + " A" + mangle( m_password );
   
  -            getLogger().debug( "Writing -> " + pwdfile );
  +            getContext().debug( "Writing -> " + pwdfile );
   
               final PrintWriter writer =
                   new PrintWriter( new FileWriter( m_passwordFile ) );
  
  
  
  1.2       +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java
  
  Index: CSharp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/dotnet/CSharp.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CSharp.java	3 Mar 2002 07:14:11 -0000	1.1
  +++ CSharp.java	11 Mar 2002 08:41:31 -0000	1.2
  @@ -10,6 +10,8 @@
   import java.io.File;
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Commandline;
  @@ -537,7 +539,7 @@
           final String[] dependencies = scanner.getIncludedFiles();
           final String message = "compiling " + dependencies.length + " file" +
               ( ( dependencies.length == 1 ) ? "" : "s" );
  -        getLogger().info( message );
  +        getContext().info( message );
           final String baseDir = scanner.getBasedir().toString();
           //add to the command
           for( int i = 0; i < dependencies.length; i++ )
  
  
  
  1.2       +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java
  
  Index: Ilasm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/dotnet/Ilasm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Ilasm.java	3 Mar 2002 07:14:11 -0000	1.1
  +++ Ilasm.java	11 Mar 2002 08:41:31 -0000	1.2
  @@ -10,6 +10,8 @@
   import java.io.File;
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Commandline;
  @@ -229,7 +231,7 @@
   
           final String message = "assembling " + dependencies.length + " file" +
               ( ( dependencies.length == 1 ) ? "" : "s" );
  -        getLogger().info( message );
  +        getContext().info( message );
   
           //add to the command
           for( int i = 0; i < dependencies.length; i++ )
  
  
  
  1.5       +9 -9      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java
  
  Index: CopyTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/CopyTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CopyTask.java	4 Mar 2002 02:44:15 -0000	1.4
  +++ CopyTask.java	11 Mar 2002 08:41:31 -0000	1.5
  @@ -18,6 +18,7 @@
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.FileNameMapper;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -34,7 +35,7 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <A href="gholam@xtra.co.nz">Michael McCallum</A>
    * @author <a href="mailto:umagesh@rediffmail.com">Magesh Umasankar</a>
  - * @version $Revision: 1.4 $ $Date: 2002/03/04 02:44:15 $
  + * @version $Revision: 1.5 $ $Date: 2002/03/11 08:41:31 $
    */
   public class CopyTask
       extends AbstractTask
  @@ -131,7 +132,7 @@
               {
                   final String message =
                       REZ.getString( "copy.omit-uptodate.notice", m_file, m_destFile );
  -                getLogger().debug( message );
  +                getContext().debug( message );
               }
           }
   
  @@ -287,7 +288,6 @@
           else
           {
               final SourceFileScanner scanner = new SourceFileScanner();
  -            setupLogger( scanner );
               return scanner.restrict( names, fromDir, toDir, mapper, getContext() );
           }
       }
  @@ -329,7 +329,7 @@
               {
                   final String message =
                       REZ.getString( "copy.selfcopy-ignored.notice", source );
  -                getLogger().info( message );
  +                getContext().info( message );
                   continue;
               }
   
  @@ -337,7 +337,7 @@
               {
                   final String message =
                       REZ.getString( "copy.filecopy.notice", source, destination );
  -                getLogger().info( message );
  +                getContext().info( message );
   
                   doOperation( source, destination );
               }
  @@ -367,7 +367,7 @@
                   {
                       final String message =
                           REZ.getString( "copy.dircopy.error", dir.getAbsolutePath() );
  -                    getLogger().error( message );
  +                    getContext().error( message );
                   }
                   else
                   {
  @@ -431,7 +431,7 @@
               REZ.getString( "copy.dir-count.notice",
                              new Integer( count ),
                              m_destDir.getAbsolutePath() );
  -        getLogger().info( message );
  +        getContext().info( message );
       }
   
       /**
  @@ -439,13 +439,13 @@
        */
       private void displayFilecountNotice( final int count )
       {
  -        if( getLogger().isInfoEnabled() )
  +        if( getContext().isInfoEnabled() )
           {
               final String message =
                   REZ.getString( "copy.file-count.notice",
                                  new Integer( count ),
                                  m_destDir.getAbsolutePath() );
  -            getLogger().info( message );
  +            getContext().info( message );
           }
       }
   }
  
  
  
  1.4       +10 -9     jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Delete.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Delete.java	9 Mar 2002 02:04:26 -0000	1.3
  +++ Delete.java	11 Mar 2002 08:41:31 -0000	1.4
  @@ -13,6 +13,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  @@ -26,7 +27,7 @@
    * @author <a href="mailto:tad1@cornell.edu">Tom Dimock</a>
    * @author <a href="mailto:glennm@ca.ibm.com">Glenn McAllister</a>
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Revision: 1.3 $ $Date: 2002/03/09 02:04:26 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/11 08:41:31 $
    */
   public class Delete
       extends AbstractTask
  @@ -86,7 +87,7 @@
           {
               final String message =
                   REZ.getString( "delete.delete-dir.notice", m_dir.getAbsolutePath() );
  -            getLogger().info( message );
  +            getContext().info( message );
               deleteDir( m_dir );
           }
   
  @@ -123,7 +124,7 @@
           {
               final String message =
                   REZ.getString( "delete.missing-file.error", m_file.getAbsolutePath() );
  -            getLogger().debug( message );
  +            getContext().debug( message );
           }
       }
   
  @@ -136,11 +137,11 @@
               deleteFiles( list );
           }
   
  -        if( getLogger().isDebugEnabled() )
  +        if( getContext().isDebugEnabled() )
           {
               final String message =
                   REZ.getString( "delete.delete-dir.notice", m_dir.getAbsolutePath() );
  -            getLogger().debug( message );
  +            getContext().debug( message );
           }
   
           if( !baseDir.delete() )
  @@ -171,11 +172,11 @@
       private void deleteFile( final File file )
           throws TaskException
       {
  -        if( getLogger().isDebugEnabled() )
  +        if( getContext().isDebugEnabled() )
           {
               final String message =
                   REZ.getString( "delete.delete-file.notice", file.getAbsolutePath() );
  -            getLogger().debug( message );
  +            getContext().debug( message );
           }
   
           if( !file.delete() )
  @@ -205,7 +206,7 @@
                   REZ.getString( "delete.delete-file.error",
                                  new Integer( files.length ),
                                  baseDir.getAbsolutePath() );
  -            getLogger().info( message );
  +            getContext().info( message );
               for( int i = 0; i < files.length; i++ )
               {
                   final File file = new File( baseDir, files[ i ] );
  @@ -233,7 +234,7 @@
                       REZ.getString( "delete.summary.notice",
                                      new Integer( dirCount ),
                                      baseDir.getAbsolutePath() );
  -                getLogger().info( message );
  +                getContext().info( message );
               }
           }
       }
  
  
  
  1.4       +1 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java
  
  Index: FilteredCopyTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/FilteredCopyTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FilteredCopyTask.java	14 Feb 2002 10:53:53 -0000	1.3
  +++ FilteredCopyTask.java	11 Mar 2002 08:41:31 -0000	1.4
  @@ -32,7 +32,7 @@
    *
    * @ant:task name="filtered-copy"
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.3 $ $Date: 2002/02/14 10:53:53 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/11 08:41:31 $
    */
   public class FilteredCopyTask
       extends CopyTask
  @@ -142,7 +142,6 @@
               for( int i = 0; i < size; i++ )
               {
                   final FilterSet filterSet = (FilterSet)m_filterSets.get( i );
  -                setupLogger( filterSet );
                   m_filterSetCollection.addFilterSet( filterSet );
               }
           }
  
  
  
  1.2       +3 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java
  
  Index: Mkdir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Mkdir.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Mkdir.java	3 Feb 2002 07:10:11 -0000	1.1
  +++ Mkdir.java	11 Mar 2002 08:41:31 -0000	1.2
  @@ -12,6 +12,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Creates specified directory.
  @@ -19,7 +20,7 @@
    * @ant:task name="mkdir"
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author duncan@x180.com
  - * @version $Revision: 1.1 $ $Date: 2002/02/03 07:10:11 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/11 08:41:31 $
    */
   public class Mkdir
       extends AbstractTask
  @@ -61,7 +62,7 @@
               }
               final String message =
                   REZ.getString( "mkdir.create.notice", m_dir.getAbsolutePath() );
  -            getLogger().info( message );
  +            getContext().info( message );
           }
       }
   }
  
  
  
  1.2       +4 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java
  
  Index: Touch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/file/Touch.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Touch.java	3 Feb 2002 07:10:11 -0000	1.1
  +++ Touch.java	11 Mar 2002 08:41:31 -0000	1.2
  @@ -18,6 +18,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  @@ -32,7 +33,7 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:mj@servidium.com">Michael J. Sikorsky</a>
    * @author <a href="mailto:shaw@servidium.com">Robert Shaw</a>
  - * @version $Revision: 1.1 $ $Date: 2002/02/03 07:10:11 $
  + * @version $Revision: 1.2 $ $Date: 2002/03/11 08:41:31 $
    */
   public class Touch
       extends AbstractTask
  @@ -141,10 +142,10 @@
           {
               if( !m_file.exists() )
               {
  -                if( getLogger().isInfoEnabled() )
  +                if( getContext().isInfoEnabled() )
                   {
                       final String message = REZ.getString( "touch.create.notice", m_file );
  -                    getLogger().info( message );
  +                    getContext().info( message );
                   }
   
                   try
  
  
  
  1.13      +3 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Exec.java	2 Mar 2002 04:03:36 -0000	1.12
  +++ Exec.java	11 Mar 2002 08:41:31 -0000	1.13
  @@ -15,6 +15,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
  @@ -170,8 +171,8 @@
       private void logExecDetails( final Properties environment )
       {
           // show the command
  -        getLogger().debug( m_command.toString() );
  +        getContext().debug( m_command.toString() );
           final String message = REZ.getString( "exec.env-vars.notice", environment );
  -        getLogger().debug( message );
  +        getContext().debug( message );
       }
   }
  
  
  
  1.8       +4 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java
  
  Index: LoadEnvironment.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/LoadEnvironment.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LoadEnvironment.java	14 Feb 2002 01:57:47 -0000	1.7
  +++ LoadEnvironment.java	11 Mar 2002 08:41:31 -0000	1.8
  @@ -15,6 +15,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * This task is responsible for loading that OS-specific environment
  @@ -52,13 +53,13 @@
               m_prefix += ".";
           }
   
  -        if( getLogger().isDebugEnabled() )
  +        if( getContext().isDebugEnabled() )
           {
               final String displayPrefix =
                   m_prefix.substring( 0, m_prefix.length() - 1 );
               final String message =
                   REZ.getString( "loadenv.prefix.notice", displayPrefix );
  -            getLogger().debug( message );
  +            getContext().debug( message );
           }
   
           final Properties environment = loadNativeEnvironment();
  @@ -71,7 +72,7 @@
               if( value.equals( "" ) )
               {
                   final String message = REZ.getString( "loadenv.ignoring-empty.warn", key );
  -                getLogger().warn( message );
  +                getContext().warn( message );
               }
               else
               {
  
  
  
  1.8       +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GenerateKey.java	10 Feb 2002 01:01:11 -0000	1.7
  +++ GenerateKey.java	11 Mar 2002 08:41:31 -0000	1.8
  @@ -10,6 +10,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
  @@ -117,7 +118,7 @@
           validate();
   
           final String message = "Generating Key for " + m_alias;
  -        getLogger().info( message );
  +        getContext().info( message );
   
           final Commandline cmd = createCommand();
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  
  
  
  1.11      +2 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SignJar.java	10 Feb 2002 01:01:11 -0000	1.10
  +++ SignJar.java	11 Mar 2002 08:41:31 -0000	1.11
  @@ -16,6 +16,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.DirectoryScanner;
  @@ -292,7 +293,7 @@
           }
   
           final String message = "Signing Jar : " + jarSource.getAbsolutePath();
  -        getLogger().info( message );
  +        getContext().info( message );
   
           final Commandline cmd = buildCommand( jarTarget, jarSource );
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  
  
  
  1.4       +14 -13    jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java
  
  Index: PrimitiveTypesTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/selftest/PrimitiveTypesTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PrimitiveTypesTest.java	1 Mar 2002 02:13:35 -0000	1.3
  +++ PrimitiveTypesTest.java	11 Mar 2002 08:41:31 -0000	1.4
  @@ -9,6 +9,7 @@
   
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Test conversion of all the primitive types.
  @@ -21,67 +22,67 @@
   {
       public void setInteger( final Integer value )
       {
  -        getLogger().warn( "setInteger( " + value + " );" );
  +        getContext().warn( "setInteger( " + value + " );" );
       }
   
       public void setInteger2( final int value )
       {
  -        getLogger().warn( "setInteger2( " + value + " );" );
  +        getContext().warn( "setInteger2( " + value + " );" );
       }
   
       public void setShort( final Short value )
       {
  -        getLogger().warn( "setShort( " + value + " );" );
  +        getContext().warn( "setShort( " + value + " );" );
       }
   
       public void setShort2( final short value )
       {
  -        getLogger().warn( "setShort2( " + value + " );" );
  +        getContext().warn( "setShort2( " + value + " );" );
       }
   
       public void setByte( final Byte value )
       {
  -        getLogger().warn( "setByte( " + value + " );" );
  +        getContext().warn( "setByte( " + value + " );" );
       }
   
       public void setByte2( final byte value )
       {
  -        getLogger().warn( "setByte2( " + value + " );" );
  +        getContext().warn( "setByte2( " + value + " );" );
       }
   
       public void setLong( final Long value )
       {
  -        getLogger().warn( "setLong( " + value + " );" );
  +        getContext().warn( "setLong( " + value + " );" );
       }
   
       public void setLong2( final long value )
       {
  -        getLogger().warn( "setLong2( " + value + " );" );
  +        getContext().warn( "setLong2( " + value + " );" );
       }
   
       public void setFloat( final Float value )
       {
  -        getLogger().warn( "setFloat( " + value + " );" );
  +        getContext().warn( "setFloat( " + value + " );" );
       }
   
       public void setFloat2( final float value )
       {
  -        getLogger().warn( "setFloat2( " + value + " );" );
  +        getContext().warn( "setFloat2( " + value + " );" );
       }
   
       public void setDouble( final Double value )
       {
  -        getLogger().warn( "setDouble( " + value + " );" );
  +        getContext().warn( "setDouble( " + value + " );" );
       }
   
       public void setDouble2( final double value )
       {
  -        getLogger().warn( "setDouble2( " + value + " );" );
  +        getContext().warn( "setDouble2( " + value + " );" );
       }
   
       public void setString( final String value )
       {
  -        getLogger().warn( "setString( " + value + " );" );
  +        getContext().warn( "setString( " + value + " );" );
       }
   
       public void execute()
  
  
  
  1.3       +5 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java
  
  Index: SoundTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/sound/SoundTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SoundTask.java	14 Feb 2002 10:53:53 -0000	1.2
  +++ SoundTask.java	11 Mar 2002 08:41:31 -0000	1.3
  @@ -14,6 +14,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.interfaces.workspace.Workspace;
   
   /**
  @@ -29,7 +30,7 @@
    * @ant:task name="sound-listener"
    * @author Nick Pellow
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.2 $, $Date: 2002/02/14 10:53:53 $
  + * @version $Revision: 1.3 $, $Date: 2002/03/11 08:41:31 $
    */
   public class SoundTask
       extends AbstractTask
  @@ -57,7 +58,7 @@
           if( null == m_success )
           {
               final String message = REZ.getString( "sound.missing-success.error" );
  -            getLogger().warn( message );
  +            getContext().warn( message );
           }
           else
           {
  @@ -70,7 +71,7 @@
           if( null == m_fail )
           {
               final String message = REZ.getString( "sound.missing-failure.error" );
  -            getLogger().warn( message );
  +            getContext().warn( message );
           }
           else
           {
  @@ -127,7 +128,7 @@
           else
           {
               final String message = REZ.getString( "sound.invalid-path.error", source );
  -            getLogger().warn( message );
  +            getContext().warn( message );
               return null;
           }
       }
  
  
  
  1.5       +3 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java
  
  Index: CopyFilesTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/CopyFilesTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CopyFilesTask.java	9 Mar 2002 10:31:30 -0000	1.4
  +++ CopyFilesTask.java	11 Mar 2002 08:41:31 -0000	1.5
  @@ -17,6 +17,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * A task that copies files.
  @@ -113,7 +114,7 @@
                       m_destFile = m_destDir.resolveFile( m_srcFile.getName().getBaseName() );
                   }
   
  -                getLogger().info( "copy " + m_srcFile + " to " + m_destFile );
  +                getContext().info( "copy " + m_srcFile + " to " + m_destFile );
                   m_destFile.copy( m_srcFile );
               }
   
  @@ -141,7 +142,7 @@
                       final FileObject destFile = m_destDir.resolveFile( path, NameScope.DESCENDENT );
   
                       // Copy the file across
  -                    getLogger().info( "copy " + srcFile + " to " + destFile );
  +                    getContext().info( "copy " + srcFile + " to " + destFile );
                       destFile.copy( srcFile );
                   }
               }
  
  
  
  1.3       +3 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java
  
  Index: ListFileSetTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFileSetTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ListFileSetTask.java	9 Mar 2002 10:31:30 -0000	1.2
  +++ ListFileSetTask.java	11 Mar 2002 08:41:31 -0000	1.3
  @@ -11,12 +11,13 @@
   import org.apache.aut.vfs.FileObject;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * A debug task, that lists the contents of a {@link FileSet}.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.2 $ $Date: 2002/03/09 10:31:30 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/11 08:41:31 $
    *
    * @ant:task name="v-list-fileset"
    */
  @@ -47,7 +48,7 @@
               {
                   final FileObject file = files[ j ];
                   final String path = paths[ j ];
  -                getLogger().info( path + " = " + file );
  +                getContext().info( path + " = " + file );
               }
           }
       }
  
  
  
  1.4       +3 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java
  
  Index: ListFilesTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/vfile/ListFilesTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ListFilesTask.java	1 Mar 2002 08:54:19 -0000	1.3
  +++ ListFilesTask.java	11 Mar 2002 08:41:31 -0000	1.4
  @@ -10,12 +10,13 @@
   import org.apache.aut.vfs.FileObject;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * A debug task, which prints out the files in a file list.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.3 $ $Date: 2002/03/01 08:54:19 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/11 08:41:31 $
    *
    * @ant:task name="v-list-path"
    */
  @@ -41,7 +42,7 @@
           for( int i = 0; i < files.length; i++ )
           {
               FileObject file = files[ i ];
  -            getLogger().info( file.toString() );
  +            getContext().info( file.toString() );
           }
       }
   }
  
  
  
  1.2       +17 -12    jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/LocalResolver.java
  
  Index: LocalResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/LocalResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalResolver.java	13 Jan 2002 07:33:23 -0000	1.1
  +++ LocalResolver.java	11 Mar 2002 08:41:32 -0000	1.2
  @@ -15,18 +15,23 @@
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.util.Hashtable;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.xml.sax.EntityResolver;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  +import org.apache.myrmidon.api.TaskContext;
   
   class LocalResolver
  -    extends AbstractLogEnabled
       implements EntityResolver
   {
  -    private Hashtable m_fileDTDs = new Hashtable();
  -    private Hashtable m_resourceDTDs = new Hashtable();
  -    private Hashtable m_urlDTDs = new Hashtable();
  +    private final Hashtable m_fileDTDs = new Hashtable();
  +    private final Hashtable m_resourceDTDs = new Hashtable();
  +    private final Hashtable m_urlDTDs = new Hashtable();
  +    private final TaskContext m_context;
  +
  +    public LocalResolver( final TaskContext context )
  +    {
  +        m_context = context;
  +    }
   
       public void registerDTD( String publicId, String location )
       {
  @@ -42,19 +47,19 @@
               {
                   m_fileDTDs.put( publicId, fileDTD );
                   final String message = "Mapped publicId " + publicId + " to file " + fileDTD;
  -                getLogger().debug( message );
  +                m_context.debug( message );
               }
               return;
           }
   
  -        if( LocalResolver.this.getClass().getResource( location ) != null )
  +        if( getClass().getResource( location ) != null )
           {
               if( publicId != null )
               {
                   m_resourceDTDs.put( publicId, location );
                   final String message = "Mapped publicId " + publicId +
                       " to resource " + location;
  -                getLogger().debug( message );
  +                m_context.debug( message );
               }
           }
   
  @@ -86,7 +91,7 @@
               try
               {
                   final String message = "Resolved " + publicId + " to local file " + dtdFile;
  -                getLogger().debug( message );
  +                m_context.debug( message );
                   return new InputSource( new FileInputStream( dtdFile ) );
               }
               catch( FileNotFoundException ex )
  @@ -101,7 +106,7 @@
               InputStream is = getClass().getResourceAsStream( dtdResourceName );
               if( is != null )
               {
  -                getLogger().debug( "Resolved " + publicId + " to local resource " + dtdResourceName );
  +                m_context.debug( "Resolved " + publicId + " to local resource " + dtdResourceName );
                   return new InputSource( is );
               }
           }
  @@ -113,7 +118,7 @@
               {
                   InputStream is = dtdUrl.openStream();
                   final String message = "Resolved " + publicId + " to url " + dtdUrl;
  -                getLogger().debug( message );
  +                m_context.debug( message );
                   return new InputSource( is );
               }
               catch( IOException ioe )
  @@ -124,7 +129,7 @@
   
           final String message = "Could not resolve ( publicId: " + publicId +
               ", systemId: " + systemId + ") to a local entity";
  -        getLogger().info( message );
  +        m_context.info( message );
   
           return null;
       }
  
  
  
  1.5       +7 -6      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/ValidatorErrorHandler.java
  
  Index: ValidatorErrorHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/ValidatorErrorHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ValidatorErrorHandler.java	18 Feb 2002 08:30:16 -0000	1.4
  +++ ValidatorErrorHandler.java	11 Mar 2002 08:41:32 -0000	1.5
  @@ -9,9 +9,9 @@
   
   import java.net.MalformedURLException;
   import java.net.URL;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.xml.sax.ErrorHandler;
   import org.xml.sax.SAXParseException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /*
    * ValidatorErrorHandler role :
  @@ -21,27 +21,28 @@
    * </ul>
    */
   final class ValidatorErrorHandler
  -    extends AbstractLogEnabled
       implements ErrorHandler
   {
       private final boolean m_warn;
  +    private final TaskContext m_context;
       private boolean m_failed;
   
  -    protected ValidatorErrorHandler( final boolean warn )
  +    protected ValidatorErrorHandler( final boolean warn, final TaskContext context )
       {
           m_warn = warn;
  +        m_context = context;
       }
   
       public void error( final SAXParseException spe )
       {
           m_failed = true;
  -        getLogger().error( getMessage( spe ), spe );
  +        m_context.error( getMessage( spe ), spe );
       }
   
       public void fatalError( final SAXParseException spe )
       {
           m_failed = true;
  -        getLogger().error( getMessage( spe ), spe );
  +        m_context.error( getMessage( spe ), spe );
       }
   
       public void warning( final SAXParseException spe )
  @@ -50,7 +51,7 @@
           // only output then if user explicitely asked for it
           if( m_warn )
           {
  -            getLogger().warn( getMessage( spe ), spe );
  +            m_context.warn( getMessage( spe ), spe );
           }
       }
   
  
  
  
  1.20      +8 -10     jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java
  
  Index: XMLValidateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XMLValidateTask.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XMLValidateTask.java	21 Feb 2002 09:38:16 -0000	1.19
  +++ XMLValidateTask.java	11 Mar 2002 08:41:32 -0000	1.20
  @@ -229,13 +229,12 @@
               }
           }
           final String message = fileProcessed + " file(s) have been successfully validated.";
  -        getLogger().info( message );
  +        getContext().info( message );
       }
   
       private EntityResolver buildEntityResolver()
       {
  -        final LocalResolver resolver = new LocalResolver();
  -        setupLogger( resolver );
  +        final LocalResolver resolver = new LocalResolver( getContext() );
   
           final int size = m_dtdLocations.size();
           for( int i = 0; i < size; i++ )
  @@ -266,7 +265,7 @@
               final String message = "Could not set feature '" + feature + "' because the parser doesn't recognize it";
               if( warn )
               {
  -                getLogger().warn( message );
  +                getContext().warn( message );
               }
           }
           catch( SAXNotSupportedException e )
  @@ -274,7 +273,7 @@
               final String message = "Could not set feature '" + feature + "' because the parser doesn't support it";
               if( warn )
               {
  -                getLogger().warn( message );
  +                getContext().warn( message );
               }
           }
           return toReturn;
  @@ -288,7 +287,7 @@
       {
           try
           {
  -            getLogger().debug( "Validating " + afile.getName() + "... " );
  +            getContext().debug( "Validating " + afile.getName() + "... " );
               m_errorHandler.reset();
               InputSource is = new InputSource( new FileReader( afile ) );
               String uri = "file:" + afile.getAbsolutePath().replace( '\\', '/' );
  @@ -345,7 +344,7 @@
               {
   
                   m_xmlReader = (XMLReader)readerClass.newInstance();
  -                getLogger().debug( "Using SAX2 reader " + m_readerClassName );
  +                getContext().debug( "Using SAX2 reader " + m_readerClassName );
               }
               else
               {
  @@ -355,7 +354,7 @@
                   {
                       Parser parser = (Parser)readerClass.newInstance();
                       m_xmlReader = new ParserAdapter( parser );
  -                    getLogger().debug( "Using SAX1 parser " + m_readerClassName );
  +                    getContext().debug( "Using SAX1 parser " + m_readerClassName );
                   }
                   else
                   {
  @@ -380,8 +379,7 @@
   
           m_xmlReader.setEntityResolver( buildEntityResolver() );
   
  -        m_errorHandler = new ValidatorErrorHandler( m_warn );
  -        setupLogger( m_errorHandler );
  +        m_errorHandler = new ValidatorErrorHandler( m_warn, getContext() );
           m_xmlReader.setErrorHandler( m_errorHandler );
   
           if( !( m_xmlReader instanceof ParserAdapter ) )
  
  
  
  1.18      +10 -8     jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java
  
  Index: XSLTProcess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/xml/XSLTProcess.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XSLTProcess.java	17 Feb 2002 10:04:43 -0000	1.17
  +++ XSLTProcess.java	11 Mar 2002 08:41:32 -0000	1.18
  @@ -21,6 +21,8 @@
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.AbstractMatchingTask;
   import org.apache.myrmidon.framework.FileSet;
   import org.apache.tools.ant.types.DirectoryScanner;
  @@ -169,7 +171,7 @@
           }
   
           final String message = "Transforming into " + m_destdir;
  -        getLogger().info( message );
  +        getContext().info( message );
   
           // Process all the files marked for styling
           processFiles( scanner );
  @@ -244,14 +246,14 @@
   
           try
           {
  -            getLogger().info( "Loading stylesheet " + m_stylesheet );
  +            getContext().info( "Loading stylesheet " + m_stylesheet );
               specifyStylesheet();
               specifyParams();
           }
           catch( final Exception e )
           {
               final String message = "Failed to read stylesheet " + m_stylesheet;
  -            getLogger().info( message );
  +            getContext().info( message );
               throw new TaskException( e.getMessage(), e );
           }
       }
  @@ -325,7 +327,7 @@
                   ensureDirectoryFor( out );
   
                   final String notice = "Processing " + in + " to " + out;
  -                getLogger().info( notice );
  +                getContext().info( notice );
                   transform( in, out );
               }
           }
  @@ -334,7 +336,7 @@
               // If failed to process document, must delete target document,
               // or it will not attempt to process it the second time
               final String message = "Failed to process " + in;
  -            getLogger().info( message );
  +            getContext().info( message );
               if( out != null )
               {
                   out.delete();
  @@ -348,9 +350,9 @@
           throws TaskException
       {
           final long styleSheetLastModified = m_stylesheet.lastModified();
  -        getLogger().debug( "In file " + in + " time: " + in.lastModified() );
  -        getLogger().debug( "Out file " + out + " time: " + out.lastModified() );
  -        getLogger().debug( "Style file " + m_stylesheet + " time: " + styleSheetLastModified );
  +        getContext().debug( "In file " + in + " time: " + in.lastModified() );
  +        getContext().debug( "Out file " + out + " time: " + out.lastModified() );
  +        getContext().debug( "Style file " + m_stylesheet + " time: " + styleSheetLastModified );
   
           processFile( in, out );
       }
  
  
  
  1.23      +1 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/AbstractTask.java
  
  Index: AbstractTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/AbstractTask.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- AbstractTask.java	25 Feb 2002 10:42:43 -0000	1.22
  +++ AbstractTask.java	11 Mar 2002 08:41:32 -0000	1.23
  @@ -8,16 +8,14 @@
   package org.apache.myrmidon.api;
   
   import java.io.File;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   
   /**
    * This is the class that Task writers should extend to provide custom tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.22 $ $Date: 2002/02/25 10:42:43 $
  + * @version $Revision: 1.23 $ $Date: 2002/03/11 08:41:32 $
    */
   public abstract class AbstractTask
  -    extends AbstractLogEnabled
       implements Task
   {
       ///Variable to hold context for use by sub-classes
  
  
  
  1.24      +18 -1     jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/TaskContext.java
  
  Index: TaskContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/TaskContext.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TaskContext.java	6 Mar 2002 10:09:45 -0000	1.23
  +++ TaskContext.java	11 Mar 2002 08:41:32 -0000	1.24
  @@ -17,7 +17,7 @@
    * Unlike other APIs the Logging is provided through another interface (LogEnabled).
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.23 $ $Date: 2002/03/06 10:09:45 $
  + * @version $Revision: 1.24 $ $Date: 2002/03/11 08:41:32 $
    */
   public interface TaskContext
   {
  @@ -99,6 +99,23 @@
        */
       void setProperty( String name, Object value )
           throws TaskException;
  +
  +    /**
  +     * Log a message.
  +     *
  +     * @param level the level to write the log message at.
  +     * @param message the message to write.
  +     */
  +    void log( LogLevel level, String message );
  +
  +    /**
  +     * Log a message.
  +     *
  +     * @param level the level to write the log message at.
  +     * @param message the message to write.
  +     * @param throwable the throwable
  +     */
  +    void log( LogLevel level, String message, Throwable throwable );
   
       /**
        * Log a debug message.
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/api/LogLevel.java
  
  Index: LogLevel.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.myrmidon.api;
  
  import java.util.HashMap;
  import java.util.Set;
  import org.apache.avalon.framework.Enum;
  
  /**
   * Type safe Enum for Log Levels and utility method
   * for using enum to write to logger.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @version $Revision: 1.1 $ $Date: 2002/03/11 08:41:32 $
   */
  public final class LogLevel
      extends Enum
  {
      //Map for all the levels
      private final static HashMap c_levels = new HashMap();
  
      //standard enums for version of JVM
      public final static LogLevel FATAL_ERROR = new LogLevel( "fatalError" );
      public final static LogLevel ERROR = new LogLevel( "error" );
      public final static LogLevel WARN = new LogLevel( "warn" );
      public final static LogLevel INFO = new LogLevel( "info" );
      public final static LogLevel DEBUG = new LogLevel( "debug" );
  
      /**
       * Retrieve the log level for the specified name.
       *
       * @param name the name of the LogLevel object to retrieve
       * @returns The LogLevel for specified name or null
       */
      public static LogLevel getByName( final String name )
      {
          return (LogLevel)c_levels.get( name );
      }
  
      /**
       * Retrieve the names of all the LogLevels.
       *
       * @returns The names of all the LogLevels
       */
      public static String[] getNames()
      {
          final Set keys = c_levels.keySet();
          return (String[])keys.toArray( new String[ keys.size() ] );
      }
  
      /**
       * Private constructor so no instance except here can be defined.
       *
       * @param name the name of Log Level
       */
      private LogLevel( final String name )
      {
          super( name, c_levels );
      }
  }
  
  
  
  1.22      +1 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java
  
  Index: AspectAwareExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/AspectAwareExecutor.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- AspectAwareExecutor.java	9 Mar 2002 10:13:03 -0000	1.21
  +++ AspectAwareExecutor.java	11 Mar 2002 08:41:32 -0000	1.22
  @@ -28,7 +28,7 @@
    * the aspects helpers.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.21 $ $Date: 2002/03/09 10:13:03 $
  + * @version $Revision: 1.22 $ $Date: 2002/03/11 08:41:32 $
    */
   public class AspectAwareExecutor
       extends DefaultExecutor
  @@ -88,7 +88,6 @@
               debug( "logger.notice", taskName );
               final Logger logger = frame.getLogger();
               getAspectManager().preLogEnabled( logger );
  -            doLogEnabled( task, taskModel, logger );
   
               debug( "contextualizing.notice", taskName );
               doContextualize( task, taskModel, frame.getContext() );
  
  
  
  1.30      +1 -29     jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
  
  Index: DefaultExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- DefaultExecutor.java	9 Mar 2002 10:13:03 -0000	1.29
  +++ DefaultExecutor.java	11 Mar 2002 08:41:32 -0000	1.30
  @@ -12,8 +12,6 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
  @@ -30,7 +28,7 @@
    * The basic executor that just executes the tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.29 $ $Date: 2002/03/09 10:13:03 $
  + * @version $Revision: 1.30 $ $Date: 2002/03/11 08:41:32 $
    */
   public class DefaultExecutor
       extends AbstractLogEnabled
  @@ -65,9 +63,6 @@
               debug( "creating.notice", taskName );
               final Task task = doCreateTask( taskName, frame );
   
  -            debug( "logger.notice", taskName );
  -            doLogEnabled( task, taskModel, frame.getLogger() );
  -
               debug( "contextualizing.notice", taskName );
               doContextualize( task, taskModel, frame.getContext() );
   
  @@ -140,29 +135,6 @@
               final String message =
                   REZ.getString( "contextualize.error", taskModel.getName() );
               throw new TaskException( message, throwable );
  -        }
  -    }
  -
  -    /**
  -     * Sets the logger for a task.
  -     */
  -    protected final void doLogEnabled( final Task task,
  -                                       final Configuration taskModel,
  -                                       final Logger logger )
  -        throws TaskException
  -    {
  -        if( task instanceof LogEnabled )
  -        {
  -            try
  -            {
  -                ( (LogEnabled)task ).enableLogging( logger );
  -            }
  -            catch( final Throwable throwable )
  -            {
  -                final String message =
  -                    REZ.getString( "logger.error", taskModel.getName() );
  -                throw new TaskException( message, throwable );
  -            }
           }
       }
   }
  
  
  
  1.7       +0 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Resources.properties
  
  Index: Resources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/Resources.properties,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Resources.properties	9 Mar 2002 10:13:03 -0000	1.6
  +++ Resources.properties	11 Mar 2002 08:41:32 -0000	1.7
  @@ -1,12 +1,10 @@
   creating.notice=Creating {0}.
  -logger.notice=Setting Logger {0}.
   contextualizing.notice=Contextualizing {0}.
   configuring.notice=Configuring {0}.
   executing.notice=Executing {0}.
   
   create.error=Could not create task <{0}>.
   contextualize.error=Could not set the context for task <{0}>.
  -logger.error=Could not set the logger for task <{0}>.
   execute.error={1}: Could not execute task <{0}>.
   
   unused-settings.error=Unused aspect settings for namespace {0} (parameterCount={1} elementCount={2}).
  
  
  
  1.21      +63 -1     jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java
  
  Index: DefaultTaskContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultTaskContext.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultTaskContext.java	11 Mar 2002 06:07:24 -0000	1.20
  +++ DefaultTaskContext.java	11 Mar 2002 08:41:32 -0000	1.21
  @@ -22,12 +22,13 @@
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.interfaces.model.DefaultNameValidator;
   import org.apache.myrmidon.interfaces.workspace.PropertyResolver;
  +import org.apache.myrmidon.api.LogLevel;
   
   /**
    * Default implementation of TaskContext.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.20 $ $Date: 2002/03/11 06:07:24 $
  + * @version $Revision: 1.21 $ $Date: 2002/03/11 08:41:32 $
    */
   public class DefaultTaskContext
       implements TaskContext, Context
  @@ -209,6 +210,67 @@
           checkPropertyName( name );
           checkPropertyValid( name, value );
           m_contextData.put( name, value );
  +    }
  +
  +    /**
  +     * Log a message.
  +     *
  +     * @param level the level to write the log message at.
  +     * @param message the message to write.
  +     */
  +    public void log( LogLevel level, String message )
  +    {
  +        if( LogLevel.FATAL_ERROR == level )
  +        {
  +            m_logger.fatalError( message );
  +        }
  +        else if( LogLevel.ERROR == level )
  +        {
  +            m_logger.error( message );
  +        }
  +        else if( LogLevel.WARN == level )
  +        {
  +            m_logger.warn( message );
  +        }
  +        else if( LogLevel.INFO == level )
  +        {
  +            m_logger.info( message );
  +        }
  +        else
  +        {
  +            m_logger.debug( message );
  +        }
  +    }
  +
  +    /**
  +     * Log a message.
  +     *
  +     * @param level the level to write the log message at.
  +     * @param message the message to write.
  +     * @param throwable the throwable.
  +     */
  +    public void log( LogLevel level, String message, Throwable throwable )
  +    {
  +        if( LogLevel.FATAL_ERROR == level )
  +        {
  +            m_logger.fatalError( message, throwable );
  +        }
  +        else if( LogLevel.ERROR == level )
  +        {
  +            m_logger.error( message, throwable );
  +        }
  +        else if( LogLevel.WARN == level )
  +        {
  +            m_logger.warn( message, throwable );
  +        }
  +        else if( LogLevel.INFO == level )
  +        {
  +            m_logger.info( message, throwable );
  +        }
  +        else
  +        {
  +            m_logger.debug( message, throwable );
  +        }
       }
   
       /**
  
  
  
  1.15      +13 -11    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java
  
  Index: DependSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/DependSet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DependSet.java	2 Mar 2002 04:03:36 -0000	1.14
  +++ DependSet.java	11 Mar 2002 08:41:32 -0000	1.15
  @@ -13,6 +13,8 @@
   import java.util.Iterator;
   import org.apache.aut.nativelib.Os;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileList;
   import org.apache.tools.ant.types.FileSet;
  @@ -60,7 +62,7 @@
    *
    *
    * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  - * @version $Revision: 1.14 $ $Date: 2002/03/02 04:03:36 $
  + * @version $Revision: 1.15 $ $Date: 2002/03/11 08:41:32 $
    */
   public class DependSet extends MatchingTask
   {
  @@ -166,7 +168,7 @@
   
                   if( dest.lastModified() > now )
                   {
  -                    getLogger().warn( "Warning: " + targetFiles[ i ] + " modified in the future." );
  +                    getContext().warn( "Warning: " + targetFiles[ i ] + " modified in the future." );
                   }
               }
           }
  @@ -188,7 +190,7 @@
                   File dest = new File( targetFL.getDir(), targetFiles[ i ] );
                   if( !dest.exists() )
                   {
  -                    getLogger().debug( targetFiles[ i ] + " does not exist." );
  +                    getContext().debug( targetFiles[ i ] + " does not exist." );
                       upToDate = false;
                       continue;
                   }
  @@ -198,7 +200,7 @@
                   }
                   if( dest.lastModified() > now )
                   {
  -                    getLogger().warn( "Warning: " + targetFiles[ i ] + " modified in the future." );
  +                    getContext().warn( "Warning: " + targetFiles[ i ] + " modified in the future." );
                   }
               }
           }
  @@ -222,7 +224,7 @@
   
                       if( src.lastModified() > now )
                       {
  -                        getLogger().warn( "Warning: " + sourceFiles[ i ] + " modified in the future." );
  +                        getContext().warn( "Warning: " + sourceFiles[ i ] + " modified in the future." );
                       }
   
                       Iterator enumTargets = allTargets.iterator();
  @@ -232,7 +234,7 @@
                           File dest = (File)enumTargets.next();
                           if( src.lastModified() > dest.lastModified() )
                           {
  -                            getLogger().debug( dest.getPath() + " is out of date with respect to " + sourceFiles[ i ] );
  +                            getContext().debug( dest.getPath() + " is out of date with respect to " + sourceFiles[ i ] );
                               upToDate = false;
   
                           }
  @@ -260,12 +262,12 @@
   
                       if( src.lastModified() > now )
                       {
  -                        getLogger().warn( "Warning: " + sourceFiles[ i ] + " modified in the future." );
  +                        getContext().warn( "Warning: " + sourceFiles[ i ] + " modified in the future." );
                       }
   
                       if( !src.exists() )
                       {
  -                        getLogger().debug( sourceFiles[ i ] + " does not exist." );
  +                        getContext().debug( sourceFiles[ i ] + " does not exist." );
                           upToDate = false;
                           break;
                       }
  @@ -278,7 +280,7 @@
   
                           if( src.lastModified() > dest.lastModified() )
                           {
  -                            getLogger().debug( dest.getPath() + " is out of date with respect to " + sourceFiles[ i ] );
  +                            getContext().debug( dest.getPath() + " is out of date with respect to " + sourceFiles[ i ] );
                               upToDate = false;
   
                           }
  @@ -289,11 +291,11 @@
   
           if( !upToDate )
           {
  -            getLogger().debug( "Deleting all target files. " );
  +            getContext().debug( "Deleting all target files. " );
               for( Iterator e = allTargets.iterator(); e.hasNext(); )
               {
                   File fileToRemove = (File)e.next();
  -                getLogger().debug( "Deleting file " + fileToRemove.getAbsolutePath() );
  +                getContext().debug( "Deleting file " + fileToRemove.getAbsolutePath() );
                   fileToRemove.delete();
               }
           }
  
  
  
  1.9       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java
  
  Index: Filter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Filter.java	21 Feb 2002 09:41:03 -0000	1.8
  +++ Filter.java	11 Mar 2002 08:41:32 -0000	1.9
  @@ -10,6 +10,7 @@
   import java.io.File;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.FilterSet;
   
   /**
  @@ -70,7 +71,7 @@
       protected void readFilters()
           throws TaskException
       {
  -        getLogger().debug( "Reading filters from " + filtersFile );
  +        getContext().debug( "Reading filters from " + filtersFile );
           getGlobalFilterSet().readFiltersFromFile( filtersFile );
       }
   
  
  
  
  1.17      +9 -8      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java
  
  Index: Get.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Get.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Get.java	21 Feb 2002 09:41:53 -0000	1.16
  +++ Get.java	11 Mar 2002 08:41:32 -0000	1.17
  @@ -17,6 +17,7 @@
   import java.util.Date;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Get a particular file from a URL source. Options include verbose reporting,
  @@ -147,7 +148,7 @@
   
           try
           {
  -            getLogger().info( "Getting: " + source );
  +            getContext().info( "Getting: " + source );
   
               //set the timestamp to the file date.
               long timestamp = 0;
  @@ -159,7 +160,7 @@
                   if( verbose )
                   {
                       Date t = new Date( timestamp );
  -                    getLogger().info( "local file date : " + t.toString() );
  +                    getContext().info( "local file date : " + t.toString() );
                   }
   
                   hasTimestamp = true;
  @@ -205,13 +206,13 @@
                       //not modified so no file download. just return instead
                       //and trace out something so the user doesn't think that the
                       //download happened when it didnt
  -                    getLogger().info( "Not modified - so not downloaded" );
  +                    getContext().info( "Not modified - so not downloaded" );
                       return;
                   }
                   // test for 401 result (HTTP only)
                   if( httpConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED )
                   {
  -                    getLogger().info( "Not authorized - check " + dest + " for details" );
  +                    getContext().info( "Not authorized - check " + dest + " for details" );
                       return;
                   }
   
  @@ -233,12 +234,12 @@
                   }
                   catch( IOException ex )
                   {
  -                    getLogger().info( "Error opening connection " + ex );
  +                    getContext().info( "Error opening connection " + ex );
                   }
               }
               if( is == null )
               {
  -                getLogger().info( "Can't get " + source + " to " + dest );
  +                getContext().info( "Can't get " + source + " to " + dest );
                   if( ignoreErrors )
                   {
                       return;
  @@ -272,7 +273,7 @@
                   if( verbose )
                   {
                       Date t = new Date( remoteTimestamp );
  -                    getLogger().info( "last modified = " + t.toString()
  +                    getContext().info( "last modified = " + t.toString()
                                         + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) );
                   }
   
  @@ -284,7 +285,7 @@
           }
           catch( IOException ioe )
           {
  -            getLogger().info( "Error getting " + source + " to " + dest );
  +            getContext().info( "Error getting " + source + " to " + dest );
               if( ignoreErrors )
               {
                   return;
  
  
  
  1.32      +5 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Java.java	10 Feb 2002 01:01:12 -0000	1.31
  +++ Java.java	11 Mar 2002 08:41:32 -0000	1.32
  @@ -13,6 +13,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
  @@ -157,7 +158,7 @@
   
           if( m_fork )
           {
  -            getLogger().debug( "Forking " + m_cmdl.toString() );
  +            getContext().debug( "Forking " + m_cmdl.toString() );
   
               return run( new Commandline( m_cmdl.getCommandline() ) );
           }
  @@ -165,14 +166,14 @@
           {
               if( m_cmdl.getVmCommand().size() > 1 )
               {
  -                getLogger().warn( "JVM args ignored when same JVM is used." );
  +                getContext().warn( "JVM args ignored when same JVM is used." );
               }
               if( m_dir != null )
               {
  -                getLogger().warn( "Working directory ignored when same JVM is used." );
  +                getContext().warn( "Working directory ignored when same JVM is used." );
               }
   
  -            getLogger().debug( "Running in same VM " + m_cmdl.getJavaCommand().toString() );
  +            getContext().debug( "Running in same VM " + m_cmdl.getJavaCommand().toString() );
               run( m_cmdl );
               return 0;
           }
  
  
  
  1.18      +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
  
  Index: PathConvert.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- PathConvert.java	2 Mar 2002 04:03:36 -0000	1.17
  +++ PathConvert.java	11 Mar 2002 08:41:32 -0000	1.18
  @@ -12,6 +12,7 @@
   import org.apache.aut.nativelib.Os;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Path;
   
   /**
  @@ -157,7 +158,7 @@
           // Place the result into the specified property
           final String value = rslt.toString();
   
  -        getLogger().debug( "Set property " + m_property + " = " + value );
  +        getContext().debug( "Set property " + m_property + " = " + value );
   
           final String name = m_property;
           getContext().setProperty( name, value );
  
  
  
  1.31      +3 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java
  
  Index: Property.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Property.java	21 Feb 2002 09:41:54 -0000	1.30
  +++ Property.java	11 Mar 2002 08:41:32 -0000	1.31
  @@ -16,6 +16,7 @@
   import java.util.Properties;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.PathUtil;
   
  @@ -126,7 +127,7 @@
           throws TaskException
       {
           Properties props = new Properties();
  -        getLogger().debug( "Resource Loading " + name );
  +        getContext().debug( "Resource Loading " + name );
           try
           {
               ClassLoader classLoader = null;
  @@ -149,7 +150,7 @@
               }
               else
               {
  -                getLogger().warn( "Unable to find resource " + name );
  +                getContext().warn( "Unable to find resource " + name );
               }
           }
           catch( IOException ex )
  
  
  
  1.27      +20 -19    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java
  
  Index: SQLExec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- SQLExec.java	21 Feb 2002 09:41:54 -0000	1.26
  +++ SQLExec.java	11 Mar 2002 08:41:32 -0000	1.27
  @@ -34,6 +34,7 @@
   import java.util.StringTokenizer;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.FileSet;
  @@ -429,7 +430,7 @@
               Class dc;
               if( classpath != null )
               {
  -                getLogger().debug( "Loading " + driver + " using AntClassLoader with classpath " + classpath );
  +                getContext().debug( "Loading " + driver + " using AntClassLoader with classpath " + classpath );
   
                   final URL[] urls = PathUtil.toURLs( classpath );
                   final ClassLoader classLoader = new URLClassLoader( urls );
  @@ -437,7 +438,7 @@
               }
               else
               {
  -                getLogger().debug( "Loading " + driver + " using system loader." );
  +                getContext().debug( "Loading " + driver + " using system loader." );
                   dc = Class.forName( driver );
               }
               driverInstance = (Driver)dc.newInstance();
  @@ -457,7 +458,7 @@
   
           try
           {
  -            getLogger().debug( "connecting to " + url );
  +            getContext().debug( "connecting to " + url );
               Properties info = new Properties();
               info.put( "user", userId );
               info.put( "password", password );
  @@ -483,7 +484,7 @@
               {
                   if( output != null )
                   {
  -                    getLogger().debug( "Opening PrintStream to output file " + output );
  +                    getContext().debug( "Opening PrintStream to output file " + output );
                       out = new PrintStream( new BufferedOutputStream( new FileOutputStream( output ) ) );
                   }
   
  @@ -495,7 +496,7 @@
                       ( (Transaction)e.next() ).runTransaction( out );
                       if( !autocommit )
                       {
  -                        getLogger().debug( "Commiting transaction" );
  +                        getContext().debug( "Commiting transaction" );
                           conn.commit();
                       }
                   }
  @@ -554,7 +555,7 @@
               }
           }
   
  -        getLogger().info( goodSql + " of " + totalSql +
  +        getContext().info( goodSql + " of " + totalSql +
                             " SQL statements executed successfully" );
       }
   
  @@ -579,10 +580,10 @@
               {
                   String theVendor = dmd.getDatabaseProductName().toLowerCase();
   
  -                getLogger().debug( "RDBMS = " + theVendor );
  +                getContext().debug( "RDBMS = " + theVendor );
                   if( theVendor == null || theVendor.indexOf( rdbms ) < 0 )
                   {
  -                    getLogger().debug( "Not the required RDBMS: " + rdbms );
  +                    getContext().debug( "Not the required RDBMS: " + rdbms );
                       return false;
                   }
               }
  @@ -591,12 +592,12 @@
               {
                   String theVersion = dmd.getDatabaseProductVersion().toLowerCase();
   
  -                getLogger().debug( "Version = " + theVersion );
  +                getContext().debug( "Version = " + theVersion );
                   if( theVersion == null ||
                       !( theVersion.startsWith( version ) ||
                       theVersion.indexOf( " " + version ) >= 0 ) )
                   {
  -                    getLogger().debug( "Not the required version: \"" + version + "\"" );
  +                    getContext().debug( "Not the required version: \"" + version + "\"" );
                       return false;
                   }
               }
  @@ -604,7 +605,7 @@
           catch( SQLException e )
           {
               // Could not get the required information
  -            getLogger().error( "Failed to obtain required RDBMS information" );
  +            getContext().error( "Failed to obtain required RDBMS information" );
               return false;
           }
   
  @@ -632,7 +633,7 @@
               totalSql++;
               if( !statement.execute( sql ) )
               {
  -                getLogger().debug( statement.getUpdateCount() + " rows affected" );
  +                getContext().debug( statement.getUpdateCount() + " rows affected" );
               }
               else
               {
  @@ -645,7 +646,7 @@
               SQLWarning warning = conn.getWarnings();
               while( warning != null )
               {
  -                getLogger().debug( warning + " sql warning" );
  +                getContext().debug( warning + " sql warning" );
                   warning = warning.getNextWarning();
               }
               conn.clearWarnings();
  @@ -653,12 +654,12 @@
           }
           catch( SQLException e )
           {
  -            getLogger().error( "Failed to execute: " + sql );
  +            getContext().error( "Failed to execute: " + sql );
               if( !onError.equals( "continue" ) )
               {
                   throw e;
               }
  -            getLogger().error( e.toString() );
  +            getContext().error( e.toString() );
           }
       }
   
  @@ -677,7 +678,7 @@
               rs = statement.getResultSet();
               if( rs != null )
               {
  -                getLogger().debug( "Processing new result set." );
  +                getContext().debug( "Processing new result set." );
                   ResultSetMetaData md = rs.getMetaData();
                   int columnCount = md.getColumnCount();
                   StringBuffer line = new StringBuffer();
  @@ -768,7 +769,7 @@
                   if( delimiterType.equals( DelimiterType.NORMAL ) && sql.endsWith( delimiter ) ||
                       delimiterType.equals( DelimiterType.ROW ) && line.equals( delimiter ) )
                   {
  -                    getLogger().debug( "SQL: " + sql );
  +                    getContext().debug( "SQL: " + sql );
                       execSQL( sql.substring( 0, sql.length() - delimiter.length() ), out );
                       sql = "";
                   }
  @@ -839,13 +840,13 @@
           {
               if( tSqlCommand.length() != 0 )
               {
  -                getLogger().info( "Executing commands" );
  +                getContext().info( "Executing commands" );
                   runStatements( new StringReader( tSqlCommand ), out );
               }
   
               if( tSrcFile != null )
               {
  -                getLogger().info( "Executing file: " + tSrcFile.getAbsolutePath() );
  +                getContext().info( "Executing file: " + tSrcFile.getAbsolutePath() );
                   Reader reader = ( encoding == null ) ? new FileReader( tSrcFile )
                       : new InputStreamReader( new FileInputStream( tSrcFile ), encoding );
                   runStatements( reader, out );
  
  
  
  1.24      +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java
  
  Index: UpToDate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/UpToDate.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- UpToDate.java	4 Mar 2002 02:44:14 -0000	1.23
  +++ UpToDate.java	11 Mar 2002 08:41:32 -0000	1.24
  @@ -12,6 +12,7 @@
   import java.util.Iterator;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.FileNameMapper;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -148,11 +149,11 @@
               getContext().setProperty( name, value );
               if( m_mapper == null )
               {
  -                getLogger().debug( "File \"" + m_targetFile.getAbsolutePath() + "\" is up to date." );
  +                getContext().debug( "File \"" + m_targetFile.getAbsolutePath() + "\" is up to date." );
               }
               else
               {
  -                getLogger().debug( "All target files have been up to date." );
  +                getContext().debug( "All target files have been up to date." );
               }
           }
       }
  @@ -161,7 +162,6 @@
           throws TaskException
       {
           SourceFileScanner scanner = new SourceFileScanner();
  -        setupLogger( scanner );
           FileNameMapper mapper = null;
           File dir = srcDir;
           if( m_mapper == null )
  
  
  
  1.3       +4 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java
  
  Index: Ear.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Ear.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Ear.java	6 Feb 2002 13:38:21 -0000	1.2
  +++ Ear.java	11 Mar 2002 08:41:33 -0000	1.3
  @@ -11,6 +11,8 @@
   import java.io.IOException;
   import org.apache.aut.zip.ZipOutputStream;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Creates a EAR archive. Based on WAR task
  @@ -48,7 +50,7 @@
       {
           // We just set the prefix for this fileset, and pass it up.
           // Do we need to do this? LH
  -        getLogger().debug( "addArchives called" );
  +        getContext().debug( "addArchives called" );
           fs.setPrefix( "/" );
           super.addFileset( fs );
       }
  @@ -81,7 +83,7 @@
                   final String message = "Warning: selected " + m_archiveType +
                       " files include a META-INF/application.xml which will be ignored " +
                       "(please use appxml attribute to " + m_archiveType + " task)";
  -                getLogger().warn( message );
  +                getContext().warn( message );
               }
               else
               {
  
  
  
  1.6       +8 -7      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Expand.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Expand.java	21 Feb 2002 09:39:15 -0000	1.5
  +++ Expand.java	11 Mar 2002 08:41:33 -0000	1.6
  @@ -18,6 +18,7 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.framework.PatternSet;
   import org.apache.myrmidon.framework.PatternUtil;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  @@ -162,10 +163,10 @@
       protected void expandFile( final File src, final File dir )
           throws TaskException
       {
  -        if( getLogger().isInfoEnabled() )
  +        if( getContext().isInfoEnabled() )
           {
               final String message = "Expanding: " + src + " into " + dir;
  -            getLogger().info( message );
  +            getContext().info( message );
           }
   
           try
  @@ -178,10 +179,10 @@
               throw new TaskException( message, ioe );
           }
   
  -        if( getLogger().isDebugEnabled() )
  +        if( getContext().isDebugEnabled() )
           {
               final String message = "expand complete";
  -            getLogger().debug( message );
  +            getContext().debug( message );
           }
       }
   
  @@ -247,11 +248,11 @@
                   file.lastModified() >= date.getTime() )
               {
                   final String message = "Skipping " + file + " as it is up-to-date";
  -                getLogger().debug( message );
  +                getContext().debug( message );
                   return;
               }
   
  -            getLogger().debug( "expanding " + entryName + " to " + file );
  +            getContext().debug( "expanding " + entryName + " to " + file );
   
               // create intermediary directories - sometimes zip don't add them
               final File parent = file.getParentFile();
  @@ -280,7 +281,7 @@
           catch( final FileNotFoundException fnfe )
           {
               final String message = "Unable to expand to file " + file.getPath();
  -            getLogger().warn( message );
  +            getContext().warn( message );
           }
       }
   }
  
  
  
  1.8       +10 -8     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java
  
  Index: Jar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Jar.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Jar.java	3 Mar 2002 06:39:06 -0000	1.7
  +++ Jar.java	11 Mar 2002 08:41:33 -0000	1.8
  @@ -21,6 +21,8 @@
   import java.util.zip.ZipFile;
   import org.apache.aut.zip.ZipOutputStream;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.manifest.Manifest;
   import org.apache.tools.ant.taskdefs.manifest.ManifestException;
   import org.apache.tools.ant.taskdefs.manifest.ManifestUtil;
  @@ -99,7 +101,7 @@
           catch( ManifestException e )
           {
               final String message = "Manifest " + manifestFile + " is invalid: " + e.getMessage();
  -            getLogger().error( message );
  +            getContext().error( message );
               throw new TaskException( message, e );
           }
           catch( IOException e )
  @@ -126,7 +128,7 @@
       public void setWhenempty( WhenEmpty we )
       {
           final String message = "JARs are never empty, they contain at least a manifest file";
  -        getLogger().warn( message );
  +        getContext().warn( message );
       }
   
       public void addManifest( Manifest newManifest )
  @@ -169,7 +171,7 @@
                   java.util.zip.ZipEntry entry = theZipFile.getEntry( "META-INF/MANIFEST.MF" );
                   if( entry == null )
                   {
  -                    getLogger().debug( "Updating jar since the current jar has no manifest" );
  +                    getContext().debug( "Updating jar since the current jar has no manifest" );
                       return false;
                   }
                   Manifest currentManifest = ManifestUtil.buildManifest( new InputStreamReader( theZipFile.getInputStream( entry ) ) );
  @@ -179,14 +181,14 @@
                   }
                   if( !currentManifest.equals( m_manifest ) )
                   {
  -                    getLogger().debug( "Updating jar since jar manifest has changed" );
  +                    getContext().debug( "Updating jar since jar manifest has changed" );
                       return false;
                   }
               }
               catch( Exception e )
               {
                   // any problems and we will rebuild
  -                getLogger().debug( "Updating jar since cannot read current jar manifest: " + e.getClass().getName() + e.getMessage() );
  +                getContext().debug( "Updating jar since cannot read current jar manifest: " + e.getClass().getName() + e.getMessage() );
                   return false;
               }
               finally
  @@ -258,7 +260,7 @@
           }
           catch( ManifestException e )
           {
  -            getLogger().error( "Manifest is invalid: " + e.getMessage() );
  +            getContext().error( "Manifest is invalid: " + e.getMessage() );
               throw new TaskException( "Invalid Manifest", e );
           }
       }
  @@ -275,7 +277,7 @@
               final String message = "Warning: selected " + m_archiveType +
                   " files include a META-INF/MANIFEST.MF which will be ignored " +
                   "(please use manifest attribute to " + m_archiveType + " task)";
  -            getLogger().warn( message );
  +            getContext().warn( message );
           }
           else
           {
  @@ -388,7 +390,7 @@
           }
           catch( ManifestException e )
           {
  -            getLogger().error( "Manifest is invalid: " + e.getMessage() );
  +            getContext().error( "Manifest is invalid: " + e.getMessage() );
               throw new TaskException( "Invalid Manifest", e );
           }
       }
  
  
  
  1.5       +7 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Tar.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Tar.java	4 Mar 2002 02:44:14 -0000	1.4
  +++ Tar.java	11 Mar 2002 08:41:33 -0000	1.5
  @@ -17,6 +17,8 @@
   import org.apache.aut.tar.TarOutputStream;
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.ScannerUtil;
   import org.apache.tools.ant.types.SourceFileScanner;
  @@ -160,11 +162,11 @@
   
           if( upToDate )
           {
  -            getLogger().info( "Nothing to do: " + tarFile.getAbsolutePath() + " is up to date." );
  +            getContext().info( "Nothing to do: " + tarFile.getAbsolutePath() + " is up to date." );
               return;
           }
   
  -        getLogger().info( "Building tar: " + tarFile.getAbsolutePath() );
  +        getContext().info( "Building tar: " + tarFile.getAbsolutePath() );
   
           TarOutputStream tOut = null;
           try
  @@ -224,7 +226,6 @@
           throws TaskException
       {
           final SourceFileScanner scanner = new SourceFileScanner();
  -        setupLogger( scanner );
           final MergingMapper mapper = new MergingMapper();
           mapper.setTo( tarFile.getAbsolutePath() );
           return scanner.restrict( files, baseDir, null, mapper, getContext() ).length == 0;
  @@ -253,19 +254,19 @@
               if( longFileMode.isOmitMode() )
               {
                   final String message = "Omitting: " + storedPath;
  -                getLogger().info( message );
  +                getContext().info( message );
                   return;
               }
               else if( longFileMode.isWarnMode() )
               {
                   final String message = "Entry: " + storedPath + " longer than " +
                       TarEntry.NAMELEN + " characters.";
  -                getLogger().warn( message );
  +                getContext().warn( message );
                   if( !longWarningGiven )
                   {
                       final String message2 = "Resulting tar file can only be processed successfully"
                           + " by GNU compatible tar commands";
  -                    getLogger().warn( message2 );
  +                    getContext().warn( message2 );
                       longWarningGiven = true;
                   }
               }
  
  
  
  1.3       +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java
  
  Index: War.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/War.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- War.java	6 Feb 2002 13:38:21 -0000	1.2
  +++ War.java	11 Mar 2002 08:41:33 -0000	1.3
  @@ -11,6 +11,8 @@
   import java.io.IOException;
   import org.apache.aut.zip.ZipOutputStream;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Creates a WAR archive.
  @@ -93,7 +95,7 @@
                   final String message = "Warning: selected " + m_archiveType +
                       " files include a WEB-INF/web.xml which will be ignored " +
                       "(please use webxml attribute to " + m_archiveType + " task)";
  -                getLogger().warn( message );
  +                getContext().warn( message );
               }
               else
               {
  
  
  
  1.6       +6 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/archive/Zip.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Zip.java	4 Mar 2002 02:44:14 -0000	1.5
  +++ Zip.java	11 Mar 2002 08:41:33 -0000	1.6
  @@ -24,6 +24,8 @@
   import org.apache.aut.zip.ZipOutputStream;
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileScanner;
  @@ -280,7 +282,7 @@
   
           String action = m_update ? "Updating " : "Building ";
   
  -        getLogger().info( action + m_archiveType + ": " + m_file.getAbsolutePath() );
  +        getContext().info( action + m_archiveType + ": " + m_file.getAbsolutePath() );
   
           boolean success = false;
           try
  @@ -385,7 +387,7 @@
               {
                   final String message = "Warning: unable to delete temporary file " +
                       renamedFile.getName();
  -                getLogger().warn( message );
  +                getContext().warn( message );
               }
           }
       }
  @@ -447,7 +449,7 @@
               {
                   final String message = "Warning: skipping " + m_archiveType + " archive " + zipFile +
                       " because no files were included.";
  -                getLogger().warn( message );
  +                getContext().warn( message );
                   return true;
               }
               else if( m_emptyBehavior.equals( "fail" ) )
  @@ -477,7 +479,6 @@
               }
   
               final SourceFileScanner scanner = new SourceFileScanner();
  -            setupLogger( scanner );
               MergingMapper mm = new MergingMapper();
               mm.setTo( zipFile.getAbsolutePath() );
               for( int i = 0; i < scanners.length; i++ )
  @@ -739,7 +740,7 @@
           // In this case using java.util.zip will not work
           // because it does not permit a zero-entry archive.
           // Must create it manually.
  -        getLogger().info( "Note: creating empty " + m_archiveType + " archive " + zipFile );
  +        getContext().info( "Note: creating empty " + m_archiveType + " archive " + zipFile );
           try
           {
               OutputStream os = new FileOutputStream( zipFile );
  
  
  
  1.4       +5 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Javac.java	6 Mar 2002 10:37:41 -0000	1.3
  +++ Javac.java	11 Mar 2002 08:41:33 -0000	1.4
  @@ -12,6 +12,8 @@
   import java.util.Iterator;
   import org.apache.aut.nativelib.Os;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.JavaVersion;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
  @@ -639,7 +641,7 @@
               final String message = "Compiling " + m_compileList.length + " source file" +
                   ( m_compileList.length == 1 ? "" : "s" ) +
                   ( m_destDir != null ? " to " + m_destDir : "" );
  -            getLogger().info( message );
  +            getContext().info( message );
   
               // now we need to populate the compiler adapter
               adapter.setJavac( this );
  @@ -709,7 +711,6 @@
           m.setFrom( "*.java" );
           m.setTo( "*.class" );
           SourceFileScanner sfs = new SourceFileScanner();
  -        setupLogger( sfs );
           File[] newFiles = sfs.restrictAsFiles( files, srcDir, destDir, m, getContext() );
   
           if( newFiles.length > 0 )
  @@ -732,12 +733,12 @@
               if( isJdkCompiler( compiler.toString() ) )
               {
                   final String message = "Since fork is true, ignoring build.compiler setting.";
  -                getLogger().warn( message );
  +                getContext().warn( message );
                   compiler = "extJavac";
               }
               else
               {
  -                getLogger().warn( "Since build.compiler setting isn't classic or modern, ignoring fork setting." );
  +                getContext().warn( "Since build.compiler setting isn't classic or modern, ignoring fork setting." );
               }
           }
           else
  
  
  
  1.9       +2 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java
  
  Index: Http.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Http.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Http.java	4 Mar 2002 04:23:38 -0000	1.8
  +++ Http.java	11 Mar 2002 08:41:33 -0000	1.9
  @@ -11,7 +11,6 @@
   import java.net.MalformedURLException;
   import java.net.URL;
   import java.net.URLConnection;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.conditions.Condition;
  @@ -25,7 +24,6 @@
    * @ant:type type="condition" name="http"
    */
   public class Http
  -    extends AbstractLogEnabled
       implements Condition
   {
       String spec = null;
  @@ -45,7 +43,7 @@
           {
               throw new TaskException( "No url specified in HTTP task" );
           }
  -        getLogger().debug( "Checking for " + spec );
  +        context.debug( "Checking for " + spec );
           try
           {
               URL url = new URL( spec );
  @@ -56,7 +54,7 @@
                   {
                       HttpURLConnection http = (HttpURLConnection)conn;
                       int code = http.getResponseCode();
  -                    getLogger().debug( "Result code for " + spec + " was " + code );
  +                    context.debug( "Result code for " + spec + " was " + code );
                       if( code > 0 && code < 500 )
                       {
                           return true;
  
  
  
  1.9       +1 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java
  
  Index: Socket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/condition/Socket.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Socket.java	4 Mar 2002 04:23:38 -0000	1.8
  +++ Socket.java	11 Mar 2002 08:41:33 -0000	1.9
  @@ -8,7 +8,6 @@
   package org.apache.tools.ant.taskdefs.condition;
   
   import java.io.IOException;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.conditions.Condition;
  @@ -22,7 +21,6 @@
    * @ant:type type="condition" name="socket"
    */
   public class Socket
  -    extends AbstractLogEnabled
       implements Condition
   {
       String server = null;
  @@ -52,7 +50,7 @@
           {
               throw new TaskException( "No port specified in Socket task" );
           }
  -        getLogger().debug( "Checking for listener at " + server + ":" + port );
  +        context.debug( "Checking for listener at " + server + ":" + port );
           try
           {
               java.net.Socket socket = new java.net.Socket( server, port );
  
  
  
  1.30      +12 -11    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Javadoc.java	2 Mar 2002 04:03:36 -0000	1.29
  +++ Javadoc.java	11 Mar 2002 08:41:33 -0000	1.30
  @@ -20,6 +20,7 @@
   import org.apache.aut.nativelib.Os;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.myrmidon.framework.Pattern;
   import org.apache.tools.ant.types.Commandline;
  @@ -536,7 +537,7 @@
               throw new TaskException( msg );
           }
   
  -        getLogger().info( "Generating Javadoc" );
  +        getContext().info( "Generating Javadoc" );
   
           if( m_doctitle != null )
           {
  @@ -662,7 +663,7 @@
                           }
                           else
                           {
  -                            getLogger().debug( "Warning: No package list was found at " + packageListLocation );
  +                            getContext().debug( "Warning: No package list was found at " + packageListLocation );
                           }
                       }
                       else
  @@ -810,9 +811,9 @@
           {
               cmd.addArgument( "@" + m_packageList );
           }
  -        getLogger().debug( "Javadoc args: " + cmd );
  +        getContext().debug( "Javadoc args: " + cmd );
   
  -        getLogger().info( "Javadoc execution" );
  +        getContext().info( "Javadoc execution" );
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
           final Execute exe = new Execute( execManager );
  @@ -873,7 +874,7 @@
           }
           else
           {
  -            getLogger().warn( "Warning: Leaving out empty argument '" + key + "'" );
  +            getContext().warn( "Warning: Leaving out empty argument '" + key + "'" );
           }
       }
   
  @@ -899,7 +900,7 @@
                                      ArrayList packages, ArrayList excludePackages )
           throws TaskException
       {
  -        getLogger().debug( "Source path = " + sourcePath.toString() );
  +        getContext().debug( "Source path = " + sourcePath.toString() );
           StringBuffer msg = new StringBuffer( "Packages = " );
           for( int i = 0; i < packages.size(); i++ )
           {
  @@ -909,7 +910,7 @@
               }
               msg.append( packages.get( i ) );
           }
  -        getLogger().debug( msg.toString() );
  +        getContext().debug( msg.toString() );
   
           msg.setLength( 0 );
           msg.append( "Exclude Packages = " );
  @@ -921,7 +922,7 @@
               }
               msg.append( excludePackages.get( i ) );
           }
  -        getLogger().debug( msg.toString() );
  +        getContext().debug( msg.toString() );
   
           ArrayList addedPackages = new ArrayList();
   
  @@ -1036,11 +1037,11 @@
       {
           if( line.startsWith( "Generating " ) || line.startsWith( "Building " ) )
           {
  -            getLogger().debug( line );
  +            getContext().debug( line );
           }
           else
           {
  -            getLogger().info( line );
  +            getContext().info( line );
           }
       }
   
  @@ -1050,6 +1051,6 @@
        */
       public void stderr( final String line )
       {
  -        getLogger().warn( line );
  +        getContext().warn( line );
       }
   }
  
  
  
  1.26      +8 -7      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java
  
  Index: ANTLR.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ANTLR.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- ANTLR.java	21 Feb 2002 09:41:54 -0000	1.25
  +++ ANTLR.java	11 Mar 2002 08:41:33 -0000	1.26
  @@ -15,6 +15,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.taskdefs.ExecuteJava;
   import org.apache.tools.ant.types.Argument;
  @@ -76,13 +77,13 @@
   
       public void setOutputdirectory( File outputDirectory )
       {
  -        getLogger().debug( "Setting output directory to: " + outputDirectory.toString() );
  +        getContext().debug( "Setting output directory to: " + outputDirectory.toString() );
           this.outputDirectory = outputDirectory;
       }
   
       public void setTarget( File target )
       {
  -        getLogger().debug( "Setting target to: " + target.toString() );
  +        getContext().debug( "Setting target to: " + target.toString() );
           this.target = target;
       }
   
  @@ -130,7 +131,7 @@
   
               if( fork )
               {
  -                getLogger().debug( "Forking " + commandline.toString() );
  +                getContext().debug( "Forking " + commandline.toString() );
                   int err = run( commandline );
                   if( err == 1 )
                   {
  @@ -166,24 +167,24 @@
               {
                   int pling = u.indexOf( "!" );
                   String jarName = u.substring( 9, pling );
  -                getLogger().debug( "Implicitly adding " + jarName + " to classpath" );
  +                getContext().debug( "Implicitly adding " + jarName + " to classpath" );
                   createClasspath().setLocation( new File( ( new File( jarName ) ).getAbsolutePath() ) );
               }
               else if( u.startsWith( "file:" ) )
               {
                   int tail = u.indexOf( resource );
                   String dirName = u.substring( 5, tail );
  -                getLogger().debug( "Implicitly adding " + dirName + " to classpath" );
  +                getContext().debug( "Implicitly adding " + dirName + " to classpath" );
                   createClasspath().setLocation( new File( ( new File( dirName ) ).getAbsolutePath() ) );
               }
               else
               {
  -                getLogger().debug( "Don\'t know how to handle resource URL " + u );
  +                getContext().debug( "Don\'t know how to handle resource URL " + u );
               }
           }
           else
           {
  -            getLogger().debug( "Couldn\'t find " + resource );
  +            getContext().debug( "Couldn\'t find " + resource );
           }
       }
   
  
  
  
  1.29      +4 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
  
  Index: Cab.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- Cab.java	2 Mar 2002 04:03:37 -0000	1.28
  +++ Cab.java	11 Mar 2002 08:41:33 -0000	1.29
  @@ -17,6 +17,8 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.aut.nativelib.Os;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Commandline;
  @@ -101,11 +103,11 @@
               return;
           }
   
  -        getLogger().info( "Building cab: " + m_cabFile.getAbsolutePath() );
  +        getContext().info( "Building cab: " + m_cabFile.getAbsolutePath() );
   
           if( !Os.isFamily( Os.OS_FAMILY_WINDOWS ) )
           {
  -            getLogger().debug( "Using listcab/libcabinet" );
  +            getContext().debug( "Using listcab/libcabinet" );
   
               final StringBuffer sb = new StringBuffer();
   
  
  
  
  1.2       +0 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ClassArgument.java
  
  Index: ClassArgument.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ClassArgument.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ClassArgument.java	6 Jan 2002 02:16:24 -0000	1.1
  +++ ClassArgument.java	11 Mar 2002 08:41:33 -0000	1.2
  @@ -7,17 +7,13 @@
    */
   package org.apache.tools.ant.taskdefs.optional;
   
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -
   public class ClassArgument
  -    extends AbstractLogEnabled
   {
       private String m_name;
   
       public void setName( String name )
       {
           m_name = name;
  -        getLogger().info( "ClassArgument.name=" + name );
       }
   
       public String getName()
  
  
  
  1.23      +14 -13    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java
  
  Index: IContract.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/IContract.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- IContract.java	3 Mar 2002 06:44:11 -0000	1.22
  +++ IContract.java	11 Mar 2002 08:41:33 -0000	1.23
  @@ -16,6 +16,7 @@
   import java.util.Properties;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.listeners.AbstractProjectListener;
   import org.apache.myrmidon.listeners.LogEvent;
   import org.apache.tools.ant.taskdefs.Java;
  @@ -515,7 +516,7 @@
       {
           if( !controlFile.exists() )
           {
  -            getLogger().info( "WARNING: Control file " + controlFile.getAbsolutePath() + " doesn't exist. iContract will be run without control file." );
  +            getContext().info( "WARNING: Control file " + controlFile.getAbsolutePath() + " doesn't exist. iContract will be run without control file." );
           }
           this.controlFile = controlFile;
       }
  @@ -698,7 +699,7 @@
               // issue warning if pre,post or invariant is used together with controlfile
               if( ( pre || post || invariant ) && controlFile != null )
               {
  -                getLogger().info( "WARNING: specifying pre,post or invariant will override control file settings" );
  +                getContext().info( "WARNING: specifying pre,post or invariant will override control file settings" );
               }
   
   
  @@ -781,7 +782,7 @@
                   }
                   catch( IOException e )
                   {
  -                    getLogger().info( "File icontrol.properties not found. That's ok. Writing a default one." );
  +                    getContext().info( "File icontrol.properties not found. That's ok. Writing a default one." );
                   }
                   iControlProps.setProperty( "sourceRoot", srcDir.getAbsolutePath() );
                   iControlProps.setProperty( "classRoot", classDir.getAbsolutePath() );
  @@ -792,11 +793,11 @@
                   try
                   {// to read existing propertiesfile
                       iControlProps.store( new FileOutputStream( "icontrol.properties" ), ICONTROL_PROPERTIES_HEADER );
  -                    getLogger().info( "Updated icontrol.properties" );
  +                    getContext().info( "Updated icontrol.properties" );
                   }
                   catch( IOException e )
                   {
  -                    getLogger().info( "Couldn't write icontrol.properties." );
  +                    getContext().info( "Couldn't write icontrol.properties." );
                   }
               }
   
  @@ -806,9 +807,9 @@
               {
                   if( iContractMissing )
                   {
  -                    getLogger().info( "iContract can't be found on your classpath. Your classpath is:" );
  -                    getLogger().info( classpath.toString() );
  -                    getLogger().info( "If you don't have the iContract jar, go get it at http://www.reliable-systems.com/tools/" );
  +                    getContext().info( "iContract can't be found on your classpath. Your classpath is:" );
  +                    getContext().info( classpath.toString() );
  +                    getContext().info( "If you don't have the iContract jar, go get it at http://www.reliable-systems.com/tools/" );
                   }
                   throw new TaskException( "iContract instrumentation failed. Code=" + result );
               }
  @@ -933,17 +934,17 @@
               if( targets == null )
               {
                   targets = new File( "targets" );
  -                getLogger().info( "Warning: targets file not specified. generating file: " + targets.getName() );
  +                getContext().info( "Warning: targets file not specified. generating file: " + targets.getName() );
                   writeTargets = true;
               }
               else if( !targets.exists() )
               {
  -                getLogger().info( "Specified targets file doesn't exist. generating file: " + targets.getName() );
  +                getContext().info( "Specified targets file doesn't exist. generating file: " + targets.getName() );
                   writeTargets = true;
               }
               if( writeTargets )
               {
  -                getLogger().info( "You should consider using iControl to create a target file." );
  +                getContext().info( "You should consider using iControl to create a target file." );
                   targetOutputStream = new FileOutputStream( targets );
                   targetPrinter = new PrintStream( targetOutputStream );
               }
  @@ -962,7 +963,7 @@
                       if( srcFile.lastModified() > now )
                       {
                           final String message = "Warning: file modified in the future: " + files[ i ];
  -                        getLogger().warn( message );
  +                        getContext().warn( message );
                       }
   
                       if( !classFile.exists() || srcFile.lastModified() > classFile.lastModified() )
  @@ -1003,7 +1004,7 @@
                               {
                                   if( !dirty )
                                   {
  -                                    getLogger().info( "Control file " + controlFile.getAbsolutePath() + " has been updated. Instrumenting all files..." );
  +                                    getContext().info( "Control file " + controlFile.getAbsolutePath() + " has been updated. Instrumenting all files..." );
                                   }
                                   dirty = true;
                                   instrumentall = true;
  
  
  
  1.22      +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
  
  Index: Javah.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Javah.java	6 Feb 2002 13:37:59 -0000	1.21
  +++ Javah.java	11 Mar 2002 08:41:33 -0000	1.22
  @@ -14,6 +14,7 @@
   import org.apache.avalon.excalibur.util.StringUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.FileUtils;
  @@ -158,7 +159,6 @@
       public ClassArgument createClass()
       {
           final ClassArgument ga = new ClassArgument();
  -        setupLogger( ga );
           m_classes.add( ga );
           return ga;
       }
  @@ -210,7 +210,7 @@
       private void logAndAddFilesToCompile( final Commandline cmd )
       {
           int n = 0;
  -        getLogger().debug( "Compilation args: " + cmd.toString() );
  +        getContext().debug( "Compilation args: " + cmd.toString() );
   
           StringBuffer niceClassList = new StringBuffer();
           if( m_cls != null )
  @@ -243,7 +243,7 @@
           prefix.append( " to be compiled:" );
           prefix.append( StringUtil.LINE_SEPARATOR );
   
  -        getLogger().debug( prefix.toString() + niceClassList.toString() );
  +        getContext().debug( prefix.toString() + niceClassList.toString() );
       }
   
       /**
  
  
  
  1.16      +10 -9     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java
  
  Index: NetRexxC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/NetRexxC.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- NetRexxC.java	18 Feb 2002 09:02:39 -0000	1.15
  +++ NetRexxC.java	11 Mar 2002 08:41:33 -0000	1.16
  @@ -21,6 +21,7 @@
   import org.apache.avalon.excalibur.util.StringUtil;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
   
  @@ -503,7 +504,7 @@
           // compile the source files
           if( compileList.size() > 0 )
           {
  -            getLogger().info( "Compiling " + compileList.size() + " source file"
  +            getContext().info( "Compiling " + compileList.size() + " source file"
                                 + ( compileList.size() == 1 ? "" : "s" )
                                 + " to " + destDir );
               doNetRexxCompile();
  @@ -599,7 +600,7 @@
               }
               else
               {
  -                getLogger().debug( "Dropping from classpath: " + f.getAbsolutePath() );
  +                getContext().debug( "Dropping from classpath: " + f.getAbsolutePath() );
               }
           }
   
  @@ -613,7 +614,7 @@
           //FIXME: This should be zapped no ?
           if( filecopyList.size() > 0 )
           {
  -            getLogger().info( "Copying " + filecopyList.size() + " file"
  +            getContext().info( "Copying " + filecopyList.size() + " file"
                                 + ( filecopyList.size() == 1 ? "" : "s" )
                                 + " to " + destDir.getAbsolutePath() );
               Iterator enum = filecopyList.keySet().iterator();
  @@ -643,7 +644,7 @@
       private void doNetRexxCompile()
           throws TaskException
       {
  -        getLogger().debug( "Using NetRexx compiler" );
  +        getContext().debug( "Using NetRexx compiler" );
           String classpath = getCompileClasspath();
           StringBuffer compileOptions = new StringBuffer();
           StringBuffer fileList = new StringBuffer();
  @@ -677,7 +678,7 @@
               compileOptions.append( compileOptionsArray[ i ] );
               compileOptions.append( " " );
           }
  -        getLogger().debug( compileOptions.toString() );
  +        getContext().debug( compileOptions.toString() );
   
           StringBuffer niceSourceList = new StringBuffer( "Files to be compiled:" + StringUtil.LINE_SEPARATOR );
   
  @@ -688,7 +689,7 @@
               niceSourceList.append( StringUtil.LINE_SEPARATOR );
           }
   
  -        getLogger().debug( niceSourceList.toString() );
  +        getContext().debug( niceSourceList.toString() );
   
           // need to set java.class.path property and restore it later
           // since the NetRexx compiler has no option for the classpath
  @@ -704,17 +705,17 @@
   
               if( rc > 1 )
               {// 1 is warnings from real NetRexxC
  -                getLogger().error( out.toString() );
  +                getContext().error( out.toString() );
                   String msg = "Compile failed, messages should have been provided.";
                   throw new TaskException( msg );
               }
               else if( rc == 1 )
               {
  -                getLogger().warn( out.toString() );
  +                getContext().warn( out.toString() );
               }
               else
               {
  -                getLogger().info( out.toString() );
  +                getContext().info( out.toString() );
               }
           }
           finally
  
  
  
  1.12      +7 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java
  
  Index: CCMCreateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CCMCreateTask.java	6 Feb 2002 13:37:59 -0000	1.11
  +++ CCMCreateTask.java	11 Mar 2002 08:41:34 -0000	1.12
  @@ -9,6 +9,8 @@
   
   import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -146,7 +148,7 @@
           cmd.addArgument( COMMAND_DEFAULT_TASK );
           cmd.addArgument( m_task );
   
  -        getLogger().debug( commandLine.toString() );
  +        getContext().debug( commandLine.toString() );
   
           final int result2 = run( cmd, null );
           if( result2 != 0 )
  @@ -219,11 +221,11 @@
        */
       public void stdout( final String line )
       {
  -        getLogger().debug( "buffer:" + line );
  +        getContext().debug( "buffer:" + line );
           final String task = getTask( line );
   
           setTask( task );
  -        getLogger().debug( "task is " + m_task );
  +        getContext().debug( "task is " + m_task );
       }
   
       private String getTask( final String line )
  @@ -236,7 +238,7 @@
           catch( final Exception e )
           {
               final String message = "error procession stream " + e.getMessage();
  -            getLogger().error( message, e );
  +            getContext().error( message, e );
           }
   
           return null;
  @@ -248,7 +250,7 @@
        */
       public void stderr( final String line )
       {
  -        getLogger().debug( "err " + line );
  +        getContext().debug( "err " + line );
       }
   }
   
  
  
  
  1.17      +8 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java
  
  Index: Translate.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Translate.java	3 Mar 2002 07:33:28 -0000	1.16
  +++ Translate.java	11 Mar 2002 08:41:34 -0000	1.17
  @@ -20,6 +20,8 @@
   import java.util.Locale;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -480,12 +482,12 @@
               ins = new FileInputStream( bundleFile );
               loaded = true;
               bundleLastModified[ i ] = new File( bundleFile ).lastModified();
  -            getLogger().debug( "Using " + bundleFile );
  +            getContext().debug( "Using " + bundleFile );
               loadResourceMap( ins );
           }
           catch( IOException ioe )
           {
  -            getLogger().debug( bundleFile + " not found." );
  +            getContext().debug( bundleFile + " not found." );
               //if all resource files associated with this bundle
               //have been scanned for and still not able to
               //find a single resrouce file, throw exception
  @@ -532,7 +534,7 @@
                       }
                       catch( Exception e )
                       {
  -                        getLogger().debug( "Exception occured while trying to check/create " + " parent directory.  " + e.getMessage() );
  +                        getContext().debug( "Exception occured while trying to check/create " + " parent directory.  " + e.getMessage() );
                       }
                       destLastModified = dest.lastModified();
                       srcLastModified = new File( srcFiles[ i ] ).lastModified();
  @@ -547,7 +549,7 @@
                           || destLastModified < bundleLastModified[ 5 ]
                           || destLastModified < bundleLastModified[ 6 ] )
                       {
  -                        getLogger().debug( "Processing " + srcFiles[ j ] );
  +                        getContext().debug( "Processing " + srcFiles[ j ] );
                           FileOutputStream fos = new FileOutputStream( dest );
                           BufferedWriter out = new BufferedWriter(
                               new OutputStreamWriter( fos,
  @@ -596,7 +598,7 @@
                                   //use the key itself as the value also.
                                   if( replace == null )
                                   {
  -                                    getLogger().debug( "Warning: The key: " + matches + " hasn't been defined." );
  +                                    getContext().debug( "Warning: The key: " + matches + " hasn't been defined." );
                                       replace = matches;
                                   }
                                   line = line.substring( 0, startIndex )
  @@ -622,7 +624,7 @@
                       }
                       else
                       {
  -                        getLogger().debug( "Skipping " + srcFiles[ j ] + " as destination file is up to date" );
  +                        getContext().debug( "Skipping " + srcFiles[ j ] + " as destination file is up to date" );
                       }
                   }
                   catch( IOException ioe )
  
  
  
  1.30      +3 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  
  Index: JJTree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JJTree.java	21 Feb 2002 09:41:54 -0000	1.29
  +++ JJTree.java	11 Mar 2002 08:41:34 -0000	1.30
  @@ -13,6 +13,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -164,7 +165,7 @@
                                           targetName.substring( 0, targetName.indexOf( ".jjt" ) ) + ".jj" );
           if( javaFile.exists() && target.lastModified() < javaFile.lastModified() )
           {
  -            getLogger().info( "Target is already built - skipping (" + target + ")" );
  +            getContext().info( "Target is already built - skipping (" + target + ")" );
               return;
           }
           cmdl.addArgument( target.getAbsolutePath() );
  @@ -182,7 +183,7 @@
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
           final Execute exe = new Execute( execManager );
  -        getLogger().debug( cmdl.toString() );
  +        getContext().debug( cmdl.toString() );
           exe.setCommandline( new Commandline( cmdl.getCommandline() ) );
           exe.setReturnCode( 0 );
           exe.execute();
  
  
  
  1.24      +3 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  
  Index: JavaCC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JavaCC.java	21 Feb 2002 09:41:54 -0000	1.23
  +++ JavaCC.java	11 Mar 2002 08:41:34 -0000	1.24
  @@ -13,6 +13,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -217,7 +218,7 @@
           final File javaFile = getOutputJavaFile( outputDirectory, target );
           if( javaFile.exists() && target.lastModified() < javaFile.lastModified() )
           {
  -            getLogger().debug( "Target is already built - skipping (" + target + ")" );
  +            getContext().debug( "Target is already built - skipping (" + target + ")" );
               return;
           }
           cmdl.addArgument( target.getAbsolutePath() );
  @@ -239,7 +240,7 @@
       private void runCommand( final CommandlineJava cmdline )
           throws TaskException
       {
  -        getLogger().debug( cmdline.toString() );
  +        getContext().debug( cmdline.toString() );
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
           final Execute exe = new Execute( execManager );
           final String[] commandline = cmdline.getCommandline();
  
  
  
  1.28      +7 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java
  
  Index: JDependTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- JDependTask.java	21 Feb 2002 09:41:54 -0000	1.27
  +++ JDependTask.java	11 Mar 2002 08:41:34 -0000	1.28
  @@ -14,6 +14,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -252,9 +253,9 @@
   
           if( m_outputFile != null )
           {
  -            getLogger().info( "Output to be stored in " + m_outputFile.getPath() );
  +            getContext().info( "Output to be stored in " + m_outputFile.getPath() );
           }
  -        getLogger().debug( "Executing: " + commandline.toString() );
  +        getContext().debug( "Executing: " + commandline.toString() );
           return exe.execute();
       }
   
  @@ -295,11 +296,11 @@
               catch( IOException e )
               {
                   String msg = "JDepend Failed when creating the output file: " + e.getMessage();
  -                getLogger().info( msg );
  +                getContext().info( msg );
                   throw new TaskException( msg );
               }
               jdepend.setWriter( new PrintWriter( fw ) );
  -            getLogger().info( "Output to be stored in " + m_outputFile.getPath() );
  +            getContext().info( "Output to be stored in " + m_outputFile.getPath() );
           }
   
           final String[] elements = FileUtils.parsePath( m_sourcesPath.toString() );
  @@ -311,7 +312,7 @@
               if( !f.exists() || !f.isDirectory() )
               {
                   String msg = "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail.";
  -                getLogger().info( msg );
  +                getContext().info( msg );
                   throw new TaskException( msg );
               }
               try
  @@ -321,7 +322,7 @@
               catch( IOException e )
               {
                   String msg = "JDepend Failed when adding a source directory: " + e.getMessage();
  -                getLogger().info( msg );
  +                getContext().info( msg );
                   throw new TaskException( msg );
               }
           }
  
  
  
  1.20      +10 -9     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java
  
  Index: JspC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/JspC.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- JspC.java	6 Mar 2002 10:37:58 -0000	1.19
  +++ JspC.java	11 Mar 2002 08:41:34 -0000	1.20
  @@ -12,6 +12,7 @@
   import java.util.Date;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapter;
   import org.apache.tools.ant.taskdefs.optional.jsp.compilers.CompilerAdapterFactory;
  @@ -57,7 +58,7 @@
    *      </a>
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    * @author <a href="mailto:jayglanville@home.com">J D Glanville</a>
  - * @version $Revision: 1.19 $ $Date: 2002/03/06 10:37:58 $
  + * @version $Revision: 1.20 $ $Date: 2002/03/11 08:41:34 $
    */
   public class JspC extends MatchingTask
   {
  @@ -378,13 +379,13 @@
           {
               compiler = "jasper";
           }
  -        getLogger().debug( "compiling " + compileList.size() + " files" );
  +        getContext().debug( "compiling " + compileList.size() + " files" );
   
           if( compileList.size() > 0 )
           {
               CompilerAdapter adapter =
                   CompilerAdapterFactory.getCompiler( compiler.toString(), getContext() );
  -            getLogger().info( "Compiling " + compileList.size() +
  +            getContext().info( "Compiling " + compileList.size() +
                                 " source file"
                                 + ( compileList.size() == 1 ? "" : "s" )
                                 + ( destDir != null ? " to " + destDir : "" ) );
  @@ -401,7 +402,7 @@
                   }
                   else
                   {
  -                    getLogger().error( FAIL_MSG );
  +                    getContext().error( FAIL_MSG );
                   }
               }
           }
  @@ -409,11 +410,11 @@
           {
               if( filecount == 0 )
               {
  -                getLogger().info( "there were no files to compile" );
  +                getContext().info( "there were no files to compile" );
               }
               else
               {
  -                getLogger().debug( "all files are up to date" );
  +                getContext().debug( "all files are up to date" );
               }
           }
       }
  @@ -460,7 +461,7 @@
                   {
                       final String message =
                           "Warning: file modified in the future: " + files[ i ];
  -                    getLogger().warn( message );
  +                    getContext().warn( message );
                   }
   
                   if( !javaFile.exists() ||
  @@ -468,11 +469,11 @@
                   {
                       if( !javaFile.exists() )
                       {
  -                        getLogger().debug( "Compiling " + srcFile.getPath() + " because java file " + javaFile.getPath() + " does not exist" );
  +                        getContext().debug( "Compiling " + srcFile.getPath() + " because java file " + javaFile.getPath() + " does not exist" );
                       }
                       else
                       {
  -                        getLogger().debug( "Compiling " + srcFile.getPath() + " because it is out of date with respect to " + javaFile.getPath() );
  +                        getContext().debug( "Compiling " + srcFile.getPath() + " because it is out of date with respect to " + javaFile.getPath() );
                       }
                       compileList.add( srcFile.getAbsolutePath() );
                   }
  
  
  
  1.20      +6 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java
  
  Index: WLJspc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- WLJspc.java	6 Feb 2002 13:38:01 -0000	1.19
  +++ WLJspc.java	11 Mar 2002 08:41:34 -0000	1.20
  @@ -12,6 +12,8 @@
   import java.util.Date;
   import java.util.StringTokenizer;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Argument;
  @@ -199,7 +201,7 @@
           args[ j++ ] = compileClasspath.toString();
   
           this.scanDir( files );
  -        getLogger().info( "Compiling " + filesToDo.size() + " JSP files" );
  +        getContext().info( "Compiling " + filesToDo.size() + " JSP files" );
   
           for( int i = 0; i < filesToDo.size(); i++ )
           {
  @@ -235,7 +237,7 @@
               helperTask.addClasspath( compileClasspath );
               if( helperTask.executeJava() != 0 )
               {
  -                getLogger().warn( files[ i ] + " failed to compile" );
  +                getContext().warn( files[ i ] + " failed to compile" );
               }
           }
       }
  @@ -298,13 +300,13 @@
               if( srcFile.lastModified() > now )
               {
                   final String message = "Warning: file modified in the future: " + files[ i ];
  -                getLogger().warn( message );
  +                getContext().warn( message );
               }
               if( srcFile.lastModified() > classFile.lastModified() )
               {
                   //log("Files are" + srcFile.getAbsolutePath()+" " +classFile.getAbsolutePath());
                   filesToDo.add( files[ i ] );
  -                getLogger().debug( "Recompiling File " + files[ i ] );
  +                getContext().debug( "Recompiling File " + files[ i ] );
               }
           }
       }
  
  
  
  1.43      +11 -11    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  
  Index: JUnitTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- JUnitTask.java	25 Feb 2002 10:42:44 -0000	1.42
  +++ JUnitTask.java	11 Mar 2002 08:41:34 -0000	1.43
  @@ -454,24 +454,24 @@
               {
                   int pling = u.indexOf( "!" );
                   String jarName = u.substring( 9, pling );
  -                getLogger().debug( "Implicitly adding " + jarName + " to classpath" );
  +                getContext().debug( "Implicitly adding " + jarName + " to classpath" );
                   createClasspath().addLocation( new File( jarName ) );
               }
               else if( u.startsWith( "file:" ) )
               {
                   int tail = u.indexOf( resource );
                   String dirName = u.substring( 5, tail );
  -                getLogger().debug( "Implicitly adding " + dirName + " to classpath" );
  +                getContext().debug( "Implicitly adding " + dirName + " to classpath" );
                   createClasspath().addLocation( new File( dirName ) );
               }
               else
               {
  -                getLogger().debug( "Don\'t know how to handle resource URL " + u );
  +                getContext().debug( "Don\'t know how to handle resource URL " + u );
               }
           }
           else
           {
  -            getLogger().debug( "Couldn\'t find " + resource );
  +            getContext().debug( "Couldn\'t find " + resource );
           }
       }
   
  @@ -530,7 +530,7 @@
               {
                   final String message = "TEST " + test.getName() + " FAILED" +
                       ( wasKilled ? " (timeout)" : "" );
  -                getLogger().error( message );
  +                getContext().error( message );
                   if( errorOccurredHere && test.getErrorProperty() != null )
                   {
                       final String name = test.getErrorProperty();
  @@ -593,7 +593,7 @@
           cmd.addArgument( "haltOnFailure=" + test.getHaltonfailure() );
           if( summary )
           {
  -            getLogger().info( "Running " + test.getName() );
  +            getContext().info( "Running " + test.getName() );
               cmd.addArgument( "formatter=org.apache.tools.ant.taskdefs.optional.junit.SummaryJUnitResultFormatter" );
           }
   
  @@ -643,7 +643,7 @@
               exe.setWorkingDirectory( dir );
           }
   
  -        getLogger().debug( "Executing: " + cmd.toString() );
  +        getContext().debug( "Executing: " + cmd.toString() );
           try
           {
               return exe.execute();
  @@ -666,7 +666,7 @@
           test.setProperties( getContext().getProperties() );
           if( dir != null )
           {
  -            getLogger().warn( "dir attribute ignored if running in the same VM" );
  +            getContext().warn( "dir attribute ignored if running in the same VM" );
           }
   
           SysProperties sysProperties = commandline.getSystemProperties();
  @@ -676,12 +676,12 @@
           }
           try
           {
  -            getLogger().debug( "Using System properties " + System.getProperties() );
  +            getContext().debug( "Using System properties " + System.getProperties() );
               ClassLoader classLoader = null;
               Path classpath = commandline.getClasspath();
               if( classpath != null )
               {
  -                getLogger().debug( "Using CLASSPATH " + classpath );
  +                getContext().debug( "Using CLASSPATH " + classpath );
                   final URL[] urls = PathUtil.toURLs( classpath );
                   classLoader = new URLClassLoader( urls );
               }
  @@ -692,7 +692,7 @@
                                             classLoader );
               if( summary )
               {
  -                getLogger().info( "Running " + test.getName() );
  +                getContext().info( "Running " + test.getName() );
   
                   SummaryJUnitResultFormatter f =
                       new SummaryJUnitResultFormatter();
  
  
  
  1.20      +6 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java
  
  Index: XMLResultAggregator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- XMLResultAggregator.java	21 Feb 2002 09:41:55 -0000	1.19
  +++ XMLResultAggregator.java	11 Mar 2002 08:41:34 -0000	1.20
  @@ -20,6 +20,7 @@
   import org.apache.avalon.framework.ExceptionUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  @@ -273,7 +274,7 @@
           {
               try
               {
  -                getLogger().debug( "Parsing file: '" + files[ i ] + "'" );
  +                getContext().debug( "Parsing file: '" + files[ i ] + "'" );
                   //XXX there seems to be a bug in xerces 1.3.0 that doesn't like file object
                   // will investigate later. It does not use the given directory but
                   // the vm dir instead ? Works fine with crimson.
  @@ -287,19 +288,19 @@
                   else
                   {
                       // issue a warning.
  -                    getLogger().warn( "the file " + files[ i ] + " is not a valid testsuite XML document" );
  +                    getContext().warn( "the file " + files[ i ] + " is not a valid testsuite XML document" );
                   }
               }
               catch( SAXException e )
               {
                   // a testcase might have failed and write a zero-length document,
                   // It has already failed, but hey.... mm. just put a warning
  -                getLogger().warn( "The file " + files[ i ] + " is not a valid XML document. It is possibly corrupted." );
  -                getLogger().debug( ExceptionUtil.printStackTrace( e ) );
  +                getContext().warn( "The file " + files[ i ] + " is not a valid XML document. It is possibly corrupted." );
  +                getContext().debug( ExceptionUtil.printStackTrace( e ) );
               }
               catch( IOException e )
               {
  -                getLogger().error( "Error while accessing file " + files[ i ] + ": " + e.getMessage() );
  +                getContext().error( "Error while accessing file " + files[ i ] + ": " + e.getMessage() );
               }
           }
           return rootElement;
  
  
  
  1.30      +4 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java
  
  Index: AbstractMetamataTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/AbstractMetamataTask.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- AbstractMetamataTask.java	18 Feb 2002 09:02:40 -0000	1.29
  +++ AbstractMetamataTask.java	11 Mar 2002 08:41:34 -0000	1.30
  @@ -18,6 +18,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
  @@ -207,7 +208,7 @@
   
           // retrieve all the files we want to scan
           m_includedFiles = scanFileSets();
  -        getLogger().debug( m_includedFiles.size() + " files added for audit" );
  +        getContext().debug( m_includedFiles.size() + " files added for audit" );
   
           // write all the options to a temp file and use it ro run the process
           ArrayList options = getOptions();
  @@ -281,7 +282,7 @@
       {
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
           final Execute exe = new Execute( execManager );
  -        getLogger().debug( m_cmdl.toString() );
  +        getContext().debug( m_cmdl.toString() );
           final String[] commandline = m_cmdl.getCommandline();
           exe.setCommandline( new Commandline( commandline ) );
           exe.setReturnCode( 0 );
  @@ -336,7 +337,7 @@
               DirectoryScanner ds = ScannerUtil.getDirectoryScanner( fs );
               ds.scan();
               String[] f = ds.getIncludedFiles();
  -            getLogger().debug( i + ") Adding " + f.length + " files from directory " + ds.getBasedir() );
  +            getContext().debug( i + ") Adding " + f.length + " files from directory " + ds.getBasedir() );
               for( int j = 0; j < f.length; j++ )
               {
                   String pathname = f[ j ];
  
  
  
  1.13      +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java
  
  Index: MAudit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MAudit.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MAudit.java	6 Jan 2002 02:29:20 -0000	1.12
  +++ MAudit.java	11 Mar 2002 08:41:34 -0000	1.13
  @@ -10,6 +10,8 @@
   import java.io.File;
   import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Path;
   
   /**
  @@ -174,7 +176,7 @@
           }
           if( !m_unused && m_searchPath != null )
           {
  -            getLogger().warn( "'searchpath' element ignored. 'unused' attribute is disabled." );
  +            getContext().warn( "'searchpath' element ignored. 'unused' attribute is disabled." );
           }
       }
   
  
  
  
  1.11      +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java
  
  Index: MMetrics.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetrics.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MMetrics.java	6 Jan 2002 02:29:20 -0000	1.10
  +++ MMetrics.java	11 Mar 2002 08:41:34 -0000	1.11
  @@ -247,7 +247,6 @@
           {
               xmlStream = new FileOutputStream( outFile );
               ExecuteStreamHandler xmlHandler = new MMetricsStreamHandler( xmlStream );
  -            setupLogger( xmlHandler );
               xmlHandler.setProcessOutputStream( tmpStream );
               xmlHandler.start();
               xmlHandler.stop();
  
  
  
  1.9       +4 -16     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java
  
  Index: MMetricsStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MMetricsStreamHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MMetricsStreamHandler.java	6 Jan 2002 02:29:20 -0000	1.8
  +++ MMetricsStreamHandler.java	11 Mar 2002 08:41:34 -0000	1.9
  @@ -26,7 +26,6 @@
   import javax.xml.transform.sax.SAXTransformerFactory;
   import javax.xml.transform.sax.TransformerHandler;
   import javax.xml.transform.stream.StreamResult;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
   import org.xml.sax.Attributes;
   import org.xml.sax.SAXException;
  @@ -43,7 +42,6 @@
    * @author <a href="mailto:sbailliez@imediation.com">Stephane Bailliez</a>
    */
   public class MMetricsStreamHandler
  -    extends AbstractLogEnabled
       implements ExecuteStreamHandler
   {
       /**
  @@ -162,7 +160,6 @@
           }
           catch( Exception e )
           {
  -            e.printStackTrace();
               throw new IOException( e.getMessage() );
           }
       }
  @@ -278,7 +275,7 @@
        * @exception SAXException Description of Exception
        */
       protected void parseOutput()
  -        throws IOException, SAXException
  +        throws IOException, SAXException, ParseException
       {
           BufferedReader br = new BufferedReader( new InputStreamReader( metricsOutput ) );
           String line = null;
  @@ -296,23 +293,14 @@
        * @exception SAXException Description of Exception
        */
       protected void processLine( String line )
  -        throws SAXException
  +        throws SAXException, ParseException
       {
           if( line.startsWith( "Construct\tV(G)\tLOC\tDIT\tNOA\tNRM\tNLM\tWMC\tRFC\tDAC\tFANOUT\tCBO\tLCOM\tNOCL" ) )
           {
               return;
           }
  -        try
  -        {
  -            MetricsElement elem = MetricsElement.parse( line );
  -            startElement( elem );
  -        }
  -        catch( ParseException e )
  -        {
  -            e.printStackTrace();
  -            // invalid lines are sent to the output as information, it might be anything,
  -            getLogger().info( line );
  -        }
  +        MetricsElement elem = MetricsElement.parse( line );
  +        startElement( elem );
       }
   
       /**
  
  
  
  1.29      +4 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java
  
  Index: MParse.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata/MParse.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- MParse.java	21 Feb 2002 09:41:55 -0000	1.28
  +++ MParse.java	11 Mar 2002 08:41:34 -0000	1.29
  @@ -17,6 +17,7 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
  @@ -283,13 +284,13 @@
           File javaFile = new File( pathname );
           if( javaFile.exists() && m_target.lastModified() < javaFile.lastModified() )
           {
  -            getLogger().info( "Target is already build - skipping (" + m_target + ")" );
  +            getContext().info( "Target is already build - skipping (" + m_target + ")" );
               return;
           }
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
           final Execute exe = new Execute( execManager );
  -        getLogger().debug( m_cmdl.toString() );
  +        getContext().debug( m_cmdl.toString() );
           final String[] commandline = m_cmdl.getCommandline();
           exe.setCommandline( new Commandline( commandline ) );
           exe.setReturnCode( 0 );
  @@ -347,7 +348,7 @@
               final File sunjj = new File( m_target.getParent(), name );
               if( sunjj.exists() )
               {
  -                getLogger().info( "Removing stale file: " + sunjj.getName() );
  +                getContext().info( "Removing stale file: " + sunjj.getName() );
                   sunjj.delete();
               }
           }
  
  
  
  1.18      +26 -26    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- FTP.java	21 Feb 2002 09:41:55 -0000	1.17
  +++ FTP.java	11 Mar 2002 08:41:34 -0000	1.18
  @@ -288,7 +288,7 @@
   
           try
           {
  -            getLogger().debug( "Opening FTP connection to " + m_server );
  +            getContext().debug( "Opening FTP connection to " + m_server );
   
               ftp = new FTPClient();
   
  @@ -298,15 +298,15 @@
                   throw new TaskException( "FTP connection failed: " + ftp.getReplyString() );
               }
   
  -            getLogger().debug( "connected" );
  -            getLogger().debug( "logging in to FTP server" );
  +            getContext().debug( "connected" );
  +            getContext().debug( "logging in to FTP server" );
   
               if( !ftp.login( m_userid, m_password ) )
               {
                   throw new TaskException( "Could not login to FTP server" );
               }
   
  -            getLogger().debug( "login succeeded" );
  +            getContext().debug( "login succeeded" );
   
               if( m_binary )
               {
  @@ -321,7 +321,7 @@
   
               if( m_passive )
               {
  -                getLogger().debug( "entering passive mode" );
  +                getContext().debug( "entering passive mode" );
                   ftp.enterLocalPassiveMode();
                   if( !FTPReply.isPositiveCompletion( ftp.getReplyCode() ) )
                   {
  @@ -344,7 +344,7 @@
               {
                   if( m_remotedir != null )
                   {
  -                    getLogger().debug( "changing the remote directory" );
  +                    getContext().debug( "changing the remote directory" );
                       ftp.changeWorkingDirectory( m_remotedir );
                       if( !FTPReply.isPositiveCompletion( ftp.getReplyCode() ) )
                       {
  @@ -353,7 +353,7 @@
                               ftp.getReplyString() );
                       }
                   }
  -                getLogger().info( ACTION_STRS[ m_action ] + " files" );
  +                getContext().info( ACTION_STRS[ m_action ] + " files" );
                   transferFiles( ftp );
               }
   
  @@ -368,7 +368,7 @@
               {
                   try
                   {
  -                    getLogger().debug( "disconnecting" );
  +                    getContext().debug( "disconnecting" );
                       ftp.logout();
                       ftp.disconnect();
                   }
  @@ -411,7 +411,7 @@
   
               if( m_verbose )
               {
  -                getLogger().info( "transferring " + filename + " to " + file.getAbsolutePath() );
  +                getContext().info( "transferring " + filename + " to " + file.getAbsolutePath() );
               }
   
               final File parent = file.getParentFile();
  @@ -427,7 +427,7 @@
                   String s = "could not get file: " + ftp.getReplyString();
                   if( m_skipFailedTransfers == true )
                   {
  -                    getLogger().warn( s );
  +                    getContext().warn( s );
                       m_skipped++;
                   }
                   else
  @@ -438,7 +438,7 @@
               }
               else
               {
  -                getLogger().debug( "File " + file.getAbsolutePath() + " copied from " + m_server );
  +                getContext().debug( "File " + file.getAbsolutePath() + " copied from " + m_server );
                   m_transferred++;
               }
           }
  @@ -465,7 +465,7 @@
       protected boolean isUpToDate( FTPClient ftp, File localFile, String remoteFile )
           throws IOException, TaskException
       {
  -        getLogger().debug( "checking date for " + remoteFile );
  +        getContext().debug( "checking date for " + remoteFile );
   
           FTPFile[] files = ftp.listFiles( remoteFile );
   
  @@ -478,7 +478,7 @@
   
               if( m_action == SEND_FILES )
               {
  -                getLogger().debug( "Could not date test remote file: " + remoteFile + "assuming out of date." );
  +                getContext().debug( "Could not date test remote file: " + remoteFile + "assuming out of date." );
                   return false;
               }
               else
  @@ -554,7 +554,7 @@
               dir = (File)parents.get( i );
               if( !m_dirCache.contains( dir ) )
               {
  -                getLogger().debug( "creating remote directory " + remoteResolveFile( dir.getPath() ) );
  +                getContext().debug( "creating remote directory " + remoteResolveFile( dir.getPath() ) );
                   ftp.makeDirectory( remoteResolveFile( dir.getPath() ) );
                   // Both codes 550 and 553 can be produced by FTP Servers
                   //  to indicate that an attempt to create a directory has
  @@ -581,7 +581,7 @@
       {
           if( m_verbose )
           {
  -            getLogger().info( "deleting " + filename );
  +            getContext().info( "deleting " + filename );
           }
   
           if( !ftp.deleteFile( remoteResolveFile( filename ) ) )
  @@ -589,7 +589,7 @@
               String s = "could not delete file: " + ftp.getReplyString();
               if( m_skipFailedTransfers == true )
               {
  -                getLogger().warn( s );
  +                getContext().warn( s );
                   m_skipped++;
               }
               else
  @@ -599,7 +599,7 @@
           }
           else
           {
  -            getLogger().debug( "File " + filename + " deleted from " + m_server );
  +            getContext().debug( "File " + filename + " deleted from " + m_server );
               m_transferred++;
           }
       }
  @@ -616,7 +616,7 @@
       {
           if( m_verbose )
           {
  -            getLogger().info( "listing " + filename );
  +            getContext().info( "listing " + filename );
           }
   
           FTPFile ftpfile = ftp.listFiles( remoteResolveFile( filename ) )[ 0 ];
  @@ -639,7 +639,7 @@
       {
           if( m_verbose )
           {
  -            getLogger().info( "creating directory: " + dir );
  +            getContext().info( "creating directory: " + dir );
           }
   
           if( !ftp.makeDirectory( dir ) )
  @@ -657,14 +657,14 @@
   
               if( m_verbose )
               {
  -                getLogger().info( "directory already exists" );
  +                getContext().info( "directory already exists" );
               }
           }
           else
           {
               if( m_verbose )
               {
  -                getLogger().info( "directory created OK" );
  +                getContext().info( "directory created OK" );
               }
           }
       }
  @@ -715,7 +715,7 @@
   
               if( m_verbose )
               {
  -                getLogger().info( "transferring " + file.getAbsolutePath() );
  +                getContext().info( "transferring " + file.getAbsolutePath() );
               }
   
               instream = new BufferedInputStream( new FileInputStream( file ) );
  @@ -729,7 +729,7 @@
                   String s = "could not put file: " + ftp.getReplyString();
                   if( m_skipFailedTransfers == true )
                   {
  -                    getLogger().warn( s );
  +                    getContext().warn( s );
                       m_skipped++;
                   }
                   else
  @@ -741,7 +741,7 @@
               else
               {
   
  -                getLogger().debug( "File " + file.getAbsolutePath() + " copied to " + m_server );
  +                getContext().debug( "File " + file.getAbsolutePath() + " copied to " + m_server );
                   m_transferred++;
               }
           }
  @@ -889,10 +889,10 @@
               }
           }
   
  -        getLogger().info( m_transferred + " files " + COMPLETED_ACTION_STRS[ m_action ] );
  +        getContext().info( m_transferred + " files " + COMPLETED_ACTION_STRS[ m_action ] );
           if( m_skipped != 0 )
           {
  -            getLogger().info( m_skipped + " files were not successfully " + COMPLETED_ACTION_STRS[ m_action ] );
  +            getContext().info( m_skipped + " files were not successfully " + COMPLETED_ACTION_STRS[ m_action ] );
           }
       }
   }
  
  
  
  1.17      +6 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java
  
  Index: MimeMail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/MimeMail.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- MimeMail.java	21 Feb 2002 09:41:55 -0000	1.16
  +++ MimeMail.java	11 Mar 2002 08:41:34 -0000	1.17
  @@ -25,6 +25,7 @@
   import javax.mail.internet.MimeMultipart;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  @@ -263,7 +264,7 @@
           MimeMessage msg = new MimeMessage( sesh );
   
           //set the sender
  -        getLogger().debug( "message sender: " + from );
  +        getContext().debug( "message sender: " + from );
           msg.setFrom( new InternetAddress( from ) );
   
           // add recipient lists
  @@ -273,7 +274,7 @@
   
           if( subject != null )
           {
  -            getLogger().debug( "subject: " + subject );
  +            getContext().debug( "subject: " + subject );
               msg.setSubject( subject );
           }
   
  @@ -326,7 +327,7 @@
                           throw new TaskException( "File \"" + file.getAbsolutePath()
                                                    + "\" does not exist or is not readable." );
                       }
  -                    getLogger().debug( "Attaching " + file.toString() + " - " + file.length() + " bytes" );
  +                    getContext().debug( "Attaching " + file.toString() + " - " + file.length() + " bytes" );
                       FileDataSource fileData = new FileDataSource( file );
                       DataHandler fileDataHandler = new DataHandler( fileData );
                       body.setDataHandler( fileDataHandler );
  @@ -337,7 +338,7 @@
           }// for i
   
           msg.setContent( attachments );
  -        getLogger().info( "sending email " );
  +        getContext().info( "sending email " );
           Transport.send( msg );
       }
   
  @@ -364,7 +365,7 @@
               else
               {
                   String text = e.toString();
  -                getLogger().error( text );
  +                getContext().error( text );
               }
           }
       }
  
  
  
  1.10      +4 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
  
  Index: TelnetTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TelnetTask.java	12 Jan 2002 23:37:25 -0000	1.9
  +++ TelnetTask.java	11 Mar 2002 08:41:34 -0000	1.10
  @@ -15,13 +15,14 @@
   import java.util.Iterator;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * Class to provide automated telnet protocol support for the Ant build tool
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:ScottCarlson@email.com">ScottCarlson@email.com</a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.10 $
    */
   public class TelnetTask
       extends AbstractTask
  @@ -226,7 +227,7 @@
               output.write( ( string + "\n" ).getBytes() );
               if( echoString )
               {
  -                getLogger().info( string );
  +                getContext().info( string );
               }
               output.flush();
           }
  @@ -269,7 +270,7 @@
                       sb.append( (char)input.read() );
                   }
               }
  -            getLogger().info( sb.toString() );
  +            getContext().info( sb.toString() );
           }
           catch( final TaskException te )
           {
  
  
  
  1.13      +5 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java
  
  Index: P4Add.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- P4Add.java	6 Feb 2002 13:38:02 -0000	1.12
  +++ P4Add.java	11 Mar 2002 08:41:35 -0000	1.13
  @@ -10,6 +10,8 @@
   import java.io.File;
   import java.util.ArrayList;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  @@ -151,7 +153,7 @@
               }
               else
               {
  -                getLogger().warn( "No files specified to add!" );
  +                getContext().warn( "No files specified to add!" );
               }
           }
   
  @@ -160,10 +162,10 @@
       private void execP4Add( final StringBuffer list )
           throws TaskException
       {
  -        if( getLogger().isInfoEnabled() )
  +        if( getContext().isInfoEnabled() )
           {
               final String message = "Execing add " + m_p4CmdOpts + " " + addCmd + list;
  -            getLogger().info( message );
  +            getContext().info( message );
           }
   
           final String command = "-s add " + m_p4CmdOpts + " " + addCmd + list;
  
  
  
  1.23      +3 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java
  
  Index: P4Base.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- P4Base.java	21 Feb 2002 09:41:55 -0000	1.22
  +++ P4Base.java	11 Mar 2002 08:41:35 -0000	1.23
  @@ -11,6 +11,7 @@
   import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.oro.text.perl.Perl5Util;
   import org.apache.tools.ant.types.Commandline;
  @@ -158,7 +159,7 @@
                   cmdl += cmdline[ i ] + " ";
               }
   
  -            getLogger().debug( "Execing " + cmdl );
  +            getContext().debug( "Execing " + cmdl );
               if( handler == null )
               {
                   handler = this;
  @@ -217,7 +218,7 @@
               registerError( new TaskException( line ) );
           }
   
  -        getLogger().info( util.substitute( "s/^.*: //", line ) );
  +        getContext().info( util.substitute( "s/^.*: //", line ) );
       }
   
       public void stderr( final String line )
  
  
  
  1.10      +4 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java
  
  Index: P4Change.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- P4Change.java	6 Feb 2002 13:38:02 -0000	1.9
  +++ P4Change.java	11 Mar 2002 08:41:35 -0000	1.10
  @@ -8,6 +8,8 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * P4Change - grab a new changelist from Perforce. P4Change creates a new
  @@ -105,7 +107,7 @@
           {
               if( util.match( "/error/", line ) )
               {
  -                getLogger().debug( "Client Error" );
  +                getContext().debug( "Client Error" );
                   registerError( new TaskException( "Perforce Error, check client settings and/or server" ) );
               }
               else if( util.match( "/<enter description here>/", line ) )
  @@ -135,7 +137,7 @@
               line = util.substitute( "s/[^0-9]//g", line );
   
               final int changenumber = Integer.parseInt( line );
  -            getLogger().info( "Change Number is " + changenumber );
  +            getContext().info( "Change Number is " + changenumber );
               try
               {
                   getContext().setProperty( "p4.change", "" + changenumber );
  
  
  
  1.10      +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java
  
  Index: P4Counter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- P4Counter.java	6 Feb 2002 13:38:03 -0000	1.9
  +++ P4Counter.java	11 Mar 2002 08:41:35 -0000	1.10
  @@ -8,6 +8,8 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * P4Counter - Obtain or set the value of a counter. P4Counter can be used to
  @@ -73,7 +75,7 @@
           }
           else
           {
  -            getLogger().debug( "P4Counter retrieved line \"" + line + "\"" );
  +            getContext().debug( "P4Counter retrieved line \"" + line + "\"" );
               try
               {
                   m_value = Integer.parseInt( line );
  
  
  
  1.6       +12 -10    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java
  
  Index: P4Label.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4Label.java	6 Jan 2002 02:30:43 -0000	1.5
  +++ P4Label.java	11 Mar 2002 08:41:35 -0000	1.6
  @@ -10,6 +10,8 @@
   import java.text.SimpleDateFormat;
   import java.util.Date;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * P4Label - create a Perforce Label. P4Label inserts a label into perforce
  @@ -46,7 +48,7 @@
   
       public void stdout( String line )
       {
  -        getLogger().debug( line );
  +        getContext().debug( line );
   
           if( null != m_labelSpec )
           {
  @@ -62,7 +64,7 @@
       public void execute()
           throws TaskException
       {
  -        getLogger().info( "P4Label exec:" );
  +        getContext().info( "P4Label exec:" );
   
           validate();
   
  @@ -77,13 +79,13 @@
           execP4Command( "label -i", null );
           execP4Command( "labelsync -l " + m_name, null );
   
  -        getLogger().info( "Created Label " + m_name + " (" + m_description + ")" );
  +        getContext().info( "Created Label " + m_name + " (" + m_description + ")" );
   
           //Now lock if required
           if( m_lock != null && m_lock.equalsIgnoreCase( "locked" ) )
           {
   
  -            getLogger().info( "Modifying lock status to 'locked'" );
  +            getContext().info( "Modifying lock status to 'locked'" );
   
               //Read back the label spec from perforce,
               //Replace Options
  @@ -92,12 +94,12 @@
               m_labelSpec = new StringBuffer();
               execP4Command( "label -o " + m_name, null );
               final String labelSpec = m_labelSpec.toString();
  -            getLogger().debug( labelSpec );
  +            getContext().debug( labelSpec );
   
               //reset labelSpec to null so output is not written to it anymore
               m_labelSpec = null;
   
  -            getLogger().debug( "Now locking label..." );
  +            getContext().debug( "Now locking label..." );
               //handler.setOutput( labelSpec );
               execP4Command( "label -i", null );
           }
  @@ -107,19 +109,19 @@
       {
           if( m_p4View == null || m_p4View.length() < 1 )
           {
  -            getLogger().warn( "View not set, assuming //depot/..." );
  +            getContext().warn( "View not set, assuming //depot/..." );
               m_p4View = "//depot/...";
           }
   
           if( m_description == null || m_description.length() < 1 )
           {
  -            getLogger().warn( "Label Description not set, assuming 'AntLabel'" );
  +            getContext().warn( "Label Description not set, assuming 'AntLabel'" );
               m_description = "AntLabel";
           }
   
           if( m_lock != null && !m_lock.equalsIgnoreCase( "locked" ) )
           {
  -            getLogger().warn( "lock attribute invalid - ignoring" );
  +            getContext().warn( "lock attribute invalid - ignoring" );
           }
   
           if( m_name == null || m_name.length() < 1 )
  @@ -127,7 +129,7 @@
               SimpleDateFormat formatter = new SimpleDateFormat( "yyyy.MM.dd-hh:mm" );
               Date now = new Date();
               m_name = "AntLabel-" + formatter.format( now );
  -            getLogger().warn( "name not set, assuming '" + m_name + "'" );
  +            getContext().warn( "name not set, assuming '" + m_name + "'" );
           }
       }
   }
  
  
  
  1.6       +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java
  
  Index: P4Submit.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- P4Submit.java	6 Jan 2002 02:30:43 -0000	1.5
  +++ P4Submit.java	11 Mar 2002 08:41:35 -0000	1.6
  @@ -8,6 +8,8 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * P4Submit - submit a numbered changelist to Perforce. <B>Note:</B> P4Submit
  @@ -35,7 +37,7 @@
        */
       public void stdout( final String line )
       {
  -        getLogger().debug( line );
  +        getContext().debug( line );
       }
   
       public void execute()
  
  
  
  1.8       +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java
  
  Index: P4Sync.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- P4Sync.java	6 Feb 2002 13:38:03 -0000	1.7
  +++ P4Sync.java	11 Mar 2002 08:41:35 -0000	1.8
  @@ -8,6 +8,8 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   
   /**
    * P4Sync - synchronise client space to a perforce depot view. The API allows
  @@ -122,7 +124,7 @@
           }
   
           final String message = "Execing sync " + m_p4CmdOpts + " " + m_syncCmd;
  -        getLogger().debug( message );
  +        getContext().debug( message );
   
           final String command = "-s sync " + m_p4CmdOpts + " " + m_syncCmd;
           execP4Command( command, null );
  
  
  
  1.23      +14 -13    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java
  
  Index: Pvcs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Pvcs.java	10 Feb 2002 01:01:11 -0000	1.22
  +++ Pvcs.java	11 Mar 2002 08:41:35 -0000	1.23
  @@ -24,6 +24,7 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
  @@ -187,8 +188,8 @@
           final File filelist = getFileList();
   
           final Commandline cmd = buildGetCommand( filelist );
  -        getLogger().info( "Getting files" );
  -        getLogger().debug( "Executing " + cmd.toString() );
  +        getContext().info( "Getting files" );
  +        getContext().debug( "Executing " + cmd.toString() );
           try
           {
               final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  @@ -258,7 +259,7 @@
           // Capture output
           // build the command line from what we got the format is
           final Commandline cmd = buildPCLICommand();
  -        getLogger().debug( "Executing " + cmd.toString() );
  +        getContext().debug( "Executing " + cmd.toString() );
   
           File tmp = null;
   
  @@ -284,7 +285,7 @@
               }
   
               // Create folders in workspace
  -            getLogger().info( "Creating folders" );
  +            getContext().info( "Creating folders" );
               createFolders( tmp );
   
               // Massage PCLI lvf output transforming '\' to '/' so get command works appropriately
  @@ -326,7 +327,7 @@
           catch( final IOException ioe )
           {
               final String message = "Failed to write to output stream";
  -            getLogger().error( message );
  +            getContext().error( message );
           }
       }
   
  @@ -336,7 +337,7 @@
        */
       public void stderr( final String line )
       {
  -        getLogger().warn( line );
  +        getContext().warn( line );
       }
   
       private Commandline buildPCLICommand()
  @@ -420,7 +421,7 @@
           String line = in.readLine();
           while( line != null )
           {
  -            getLogger().debug( "Considering \"" + line + "\"" );
  +            getContext().debug( "Considering \"" + line + "\"" );
               if( line.startsWith( "\"\\" ) ||
                   line.startsWith( "\"/" ) ||
                   line.startsWith( m_lineStart ) )
  @@ -434,30 +435,30 @@
                       File dir = new File( f.substring( 0, index ) );
                       if( !dir.exists() )
                       {
  -                        getLogger().debug( "Creating " + dir.getAbsolutePath() );
  +                        getContext().debug( "Creating " + dir.getAbsolutePath() );
                           if( dir.mkdirs() )
                           {
  -                            getLogger().info( "Created " + dir.getAbsolutePath() );
  +                            getContext().info( "Created " + dir.getAbsolutePath() );
                           }
                           else
                           {
  -                            getLogger().info( "Failed to create " + dir.getAbsolutePath() );
  +                            getContext().info( "Failed to create " + dir.getAbsolutePath() );
                           }
                       }
                       else
                       {
  -                        getLogger().debug( dir.getAbsolutePath() + " exists. Skipping" );
  +                        getContext().debug( dir.getAbsolutePath() + " exists. Skipping" );
                       }
                   }
                   else
                   {
                       final String message = "File separator problem with " + line;
  -                    getLogger().warn( message );
  +                    getContext().warn( message );
                   }
               }
               else
               {
  -                getLogger().debug( "Skipped \"" + line + "\"" );
  +                getContext().debug( "Skipped \"" + line + "\"" );
               }
               line = in.readLine();
           }
  
  
  
  1.10      +8 -7      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java
  
  Index: AntStarTeamCheckOut.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- AntStarTeamCheckOut.java	21 Feb 2002 09:41:55 -0000	1.9
  +++ AntStarTeamCheckOut.java	11 Mar 2002 08:41:35 -0000	1.10
  @@ -18,6 +18,7 @@
   import java.util.StringTokenizer;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.ScannerUtil;
   
   /**
  @@ -622,7 +623,7 @@
           // send the message to the project log.
   
           // Tell how many files were checked out.
  -        getLogger().info( checkedOut + " files checked out." );
  +        getContext().info( checkedOut + " files checked out." );
       }
   
       /**
  @@ -857,7 +858,7 @@
                   {
                       strFolder = strFolder.substring( i + 1 );
                   }
  -                getLogger().info( "            Folder: \"" + strFolder + "\"" );
  +                getContext().info( "            Folder: \"" + strFolder + "\"" );
                   prevFolder = f;
   
                   // If we displayed the project, view, item type, or folder,
  @@ -868,7 +869,7 @@
                   {
                       header.append( ",\t" ).append( p2.getDisplayName() );
                   }
  -                getLogger().info( header.toString() );
  +                getContext().info( header.toString() );
               }
   
               // Finally, show the Item properties ...
  @@ -897,7 +898,7 @@
               {
                   itemLine.append( ",\tNot locked" );
               }
  -            getLogger().info( itemLine.toString() );
  +            getContext().info( itemLine.toString() );
           }
           // END VERBOSE ONLY
   
  @@ -937,7 +938,7 @@
               {
                   if( getVerbose() )
                   {
  -                    getLogger().info( "Found " + getProjectName() + delim + getViewName() + delim );
  +                    getContext().info( "Found " + getProjectName() + delim + getViewName() + delim );
                   }
                   runType( s, p, v, s.typeForName( (String)s.getTypeNames().FILE ) );
                   break;
  @@ -961,7 +962,7 @@
               {
                   if( getVerbose() )
                   {
  -                    getLogger().info( "Found " + getProjectName() + delim );
  +                    getContext().info( "Found " + getProjectName() + delim );
                   }
                   runProject( s, p );
                   break;
  @@ -998,7 +999,7 @@
   
           if( getVerbose() && getFolderName() != null )
           {
  -            getLogger().info( "Found " + getProjectName() + delim + getViewName() +
  +            getContext().info( "Found " + getProjectName() + delim + getViewName() +
                                 delim + getFolderName() + delim + "\n" );
           }
   
  
  
  
  1.24      +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java
  
  Index: CovMerge.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovMerge.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- CovMerge.java	21 Feb 2002 09:41:55 -0000	1.23
  +++ CovMerge.java	11 Mar 2002 08:41:35 -0000	1.24
  @@ -16,6 +16,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.DirectoryScanner;
  @@ -117,7 +118,7 @@
   
               final ExecManager execManager = (ExecManager)getService( ExecManager.class );
               final Execute exe = new Execute( execManager );
  -            getLogger().debug( cmdl.toString() );
  +            getContext().debug( cmdl.toString() );
               exe.setCommandline( cmdl );
   
               // JProbe process always return 0 so  we will not be
  
  
  
  1.25      +7 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java
  
  Index: CovReport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/CovReport.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CovReport.java	21 Feb 2002 09:41:55 -0000	1.24
  +++ CovReport.java	11 Mar 2002 08:41:35 -0000	1.25
  @@ -20,6 +20,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.EnumeratedAttribute;
  @@ -250,15 +251,15 @@
               // use the custom handler for stdin issues
               final ExecManager execManager = (ExecManager)getService( ExecManager.class );
               final Execute exe = new Execute( execManager );
  -            getLogger().debug( cmdl.toString() );
  +            getContext().debug( cmdl.toString() );
               exe.setCommandline( cmdl );
               int exitValue = exe.execute();
               if( exitValue != 0 )
               {
                   throw new TaskException( "JProbe Coverage Report failed (" + exitValue + ")" );
               }
  -            getLogger().debug( "coveragePath: " + coveragePath );
  -            getLogger().debug( "format: " + format );
  +            getContext().debug( "coveragePath: " + coveragePath );
  +            getContext().debug( "format: " + format );
               if( reference != null && "xml".equals( format ) )
               {
                   reference.createEnhancedXMLReport();
  @@ -340,7 +341,7 @@
           }
           if( reference != null && !"xml".equals( format ) )
           {
  -            getLogger().info( "Ignored reference. It cannot be used in non XML report." );
  +            getContext().info( "Ignored reference. It cannot be used in non XML report." );
               reference = null;// nullify it so that there is no ambiguity
           }
   
  @@ -406,13 +407,13 @@
               if( filters == null || filters.size() == 0 )
               {
                   createFilters();
  -                getLogger().debug( "Adding default include filter to *.*()" );
  +                getContext().debug( "Adding default include filter to *.*()" );
                   Include include = new Include();
                   filters.addInclude( include );
               }
               try
               {
  -                getLogger().debug( "Creating enhanced XML report" );
  +                getContext().debug( "Creating enhanced XML report" );
                   XMLReport report = new XMLReport( CovReport.this, tofile );
                   report.setReportFilters( filters );
                   report.setJProbehome( new File( home.getParent() ) );
  
  
  
  1.25      +4 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java
  
  Index: Coverage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/Coverage.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Coverage.java	21 Feb 2002 09:41:55 -0000	1.24
  +++ Coverage.java	11 Mar 2002 08:41:35 -0000	1.25
  @@ -16,6 +16,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
  @@ -251,7 +252,7 @@
               // use the custom handler for stdin issues
               final ExecManager execManager = (ExecManager)getService( ExecManager.class );
               final Execute exe = new Execute( execManager );
  -            getLogger().debug( cmdl.toString() );
  +            getContext().debug( cmdl.toString() );
               exe.setCommandline( cmdl );
               int exitValue = exe.execute();
               if( exitValue != 0 )
  @@ -412,7 +413,7 @@
       {
           //@todo change this when switching to JDK 1.2 and use File.createTmpFile()
           File file = File.createTempFile( "jpcoverage", "tmp" );
  -        getLogger().debug( "Creating parameter file: " + file );
  +        getContext().debug( "Creating parameter file: " + file );
   
           // options need to be one per line in the parameter file
           // so write them all in a single string
  @@ -424,7 +425,7 @@
               pw.println( params[ i ] );
           }
           pw.flush();
  -        getLogger().debug( "JProbe Coverage parameters:\n" + sw.toString() );
  +        getContext().debug( "JProbe Coverage parameters:\n" + sw.toString() );
   
           // now write them to the file
           FileWriter fw = null;
  
  
  
  1.8       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java
  
  Index: XMLReport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/XMLReport.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XMLReport.java	21 Feb 2002 09:41:55 -0000	1.7
  +++ XMLReport.java	11 Mar 2002 08:41:35 -0000	1.8
  @@ -16,6 +16,7 @@
   import javax.xml.parsers.DocumentBuilder;
   import javax.xml.parsers.DocumentBuilderFactory;
   import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassFile;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.ClassPathLoader;
   import org.apache.tools.ant.taskdefs.optional.sitraka.bytecode.MethodInfo;
  @@ -194,7 +195,7 @@
           }
           else
           {
  -            task.getLogger().debug( message );
  +            task.getContext().debug( message );
           }
       }
   
  
  
  
  1.10      +3 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java
  
  Index: MSVSSCHECKIN.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MSVSSCHECKIN.java	5 Mar 2002 07:54:00 -0000	1.9
  +++ MSVSSCHECKIN.java	11 Mar 2002 08:41:35 -0000	1.10
  @@ -9,6 +9,8 @@
   
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   
  @@ -133,7 +135,7 @@
                   }
   
                   final String message = "Created dir: " + dir.getAbsolutePath();
  -                getLogger().info( message );
  +                getContext().info( message );
               }
   
               cmd.addArgument( FLAG_OVERRIDE_WORKING_DIR + m_localPath );
  
  
  
  1.10      +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java
  
  Index: MSVSSCHECKOUT.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MSVSSCHECKOUT.java	5 Mar 2002 07:54:00 -0000	1.9
  +++ MSVSSCHECKOUT.java	11 Mar 2002 08:41:35 -0000	1.10
  @@ -10,6 +10,7 @@
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   
  @@ -169,7 +170,7 @@
                   else
                   {
                       final String message = "Created dir: " + dir.getAbsolutePath();
  -                    getLogger().info( message );
  +                    getContext().info( message );
                   }
               }
   
  
  
  
  1.9       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java
  
  Index: MSVSSGET.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- MSVSSGET.java	18 Feb 2002 09:02:40 -0000	1.8
  +++ MSVSSGET.java	11 Mar 2002 08:41:35 -0000	1.9
  @@ -10,6 +10,7 @@
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   
  @@ -390,7 +391,7 @@
                           "successful for an unknown reason";
                       throw new TaskException( msg );
                   }
  -                getLogger().info( "Created dir: " + dir.getAbsolutePath() );
  +                getContext().info( "Created dir: " + dir.getAbsolutePath() );
               }
   
               cmd.addArgument( FLAG_OVERRIDE_WORKING_DIR + m_LocalPath );
  
  
  
  1.4       +11 -10    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/Rmic.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Rmic.java	6 Mar 2002 10:37:00 -0000	1.3
  +++ Rmic.java	11 Mar 2002 08:41:35 -0000	1.4
  @@ -15,6 +15,8 @@
   import java.util.ArrayList;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.FileNameMapper;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
  @@ -442,20 +444,20 @@
           {
               final String message = "Unable to verify class " + classname +
                   ". It could not be found.";
  -            getLogger().warn( message );
  +            getContext().warn( message );
           }
           catch( NoClassDefFoundError e )
           {
               final String message = "Unable to verify class " + classname +
                   ". It is not defined.";
  -            getLogger().warn( message );
  +            getContext().warn( message );
           }
           catch( Throwable t )
           {
               final String message = "Unable to verify class " + classname +
                   ". Loading caused Exception: " +
                   t.getMessage();
  -            getLogger().warn( message );
  +            getContext().warn( message );
           }
           // we only get here if an exception has been thrown
           return false;
  @@ -475,7 +477,7 @@
   
           if( verify )
           {
  -            getLogger().info( "Verify has been turned on." );
  +            getContext().info( "Verify has been turned on." );
           }
   
           String compiler = getContext().getProperty( "build.rmic" ).toString();
  @@ -507,7 +509,7 @@
           int fileCount = compileList.size();
           if( fileCount > 0 )
           {
  -            getLogger().info( "RMI Compiling " + fileCount + " class" + ( fileCount > 1 ? "es" : "" ) + " to " + baseDir );
  +            getContext().info( "RMI Compiling " + fileCount + " class" + ( fileCount > 1 ? "es" : "" ) + " to " + baseDir );
   
               // finally, lets execute the compiler!!
               if( !adapter.execute() )
  @@ -525,8 +527,8 @@
           {
               if( idl )
               {
  -                getLogger().warn( "Cannot determine sourcefiles in idl mode, " );
  -                getLogger().warn( "sourcebase attribute will be ignored." );
  +                getContext().warn( "Cannot determine sourcefiles in idl mode, " );
  +                getContext().warn( "sourcebase attribute will be ignored." );
               }
               else
               {
  @@ -557,17 +559,16 @@
           String[] newFiles = files;
           if( idl )
           {
  -            getLogger().debug( "will leave uptodate test to rmic implementation in idl mode." );
  +            getContext().debug( "will leave uptodate test to rmic implementation in idl mode." );
           }
           else if( iiop
               && iiopopts != null && iiopopts.indexOf( "-always" ) > -1 )
           {
  -            getLogger().debug( "no uptodate test as -always option has been specified" );
  +            getContext().debug( "no uptodate test as -always option has been specified" );
           }
           else
           {
               final SourceFileScanner scanner = new SourceFileScanner();
  -            setupLogger( scanner );
               newFiles = scanner.restrict( files, baseDir, baseDir, mapper, getContext() );
           }
   
  
  
  
  1.6       +9 -7      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java
  
  Index: FixCRLF.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/FixCRLF.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FixCRLF.java	2 Mar 2002 04:03:37 -0000	1.5
  +++ FixCRLF.java	11 Mar 2002 08:41:35 -0000	1.6
  @@ -24,6 +24,8 @@
   import org.apache.aut.nativelib.Os;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
   
  @@ -66,7 +68,7 @@
    *
    * @author Sam Ruby <a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>
    * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  - * @version $Revision: 1.5 $ $Name:  $
  + * @version $Revision: 1.6 $ $Name:  $
    */
   public class FixCRLF
       extends MatchingTask
  @@ -318,7 +320,7 @@
           }
   
           // log options used
  -        getLogger().debug( "options:" +
  +        getContext().debug( "options:" +
                              " eol=" +
                              ( eol == ASIS ? "asis" : eol == CR ? "cr" : eol == LF ? "lf" : "crlf" ) +
                              " tab=" + ( tabs == TABS ? "add" : tabs == ASIS ? "asis" : "remove" ) +
  @@ -752,11 +754,11 @@
               if( destFile.exists() )
               {
                   // Compare the destination with the temp file
  -                getLogger().debug( "destFile exists" );
  +                getContext().debug( "destFile exists" );
                   boolean result = FileUtil.contentEquals( destFile, tmpFile );
                   if( !result )
                   {
  -                    getLogger().debug( destFile + " is being written" );
  +                    getContext().debug( destFile + " is being written" );
                       if( !destFile.delete() )
                       {
                           throw new TaskException( "Unable to delete "
  @@ -774,7 +776,7 @@
                   }
                   else
                   {// destination is equal to temp file
  -                    getLogger().debug( destFile + " is not written, as the contents are identical" );
  +                    getContext().debug( destFile + " is not written, as the contents are identical" );
                       if( !tmpFile.delete() )
                       {
                           throw new TaskException( "Unable to delete "
  @@ -785,7 +787,7 @@
               else
               {// destFile does not exist - write the temp file
                   ///XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  -                getLogger().debug( "destFile does not exist" );
  +                getContext().debug( "destFile does not exist" );
                   if( !tmpFile.renameTo( destFile ) )
                   {
                       throw new TaskException(
  @@ -814,7 +816,7 @@
               }
               catch( IOException io )
               {
  -                getLogger().error( "Error closing " + srcFile );
  +                getContext().error( "Error closing " + srcFile );
               }// end of catch
   
               if( tmpFile != null )
  
  
  
  1.9       +4 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java
  
  Index: Native2Ascii.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Native2Ascii.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Native2Ascii.java	4 Mar 2002 02:44:14 -0000	1.8
  +++ Native2Ascii.java	11 Mar 2002 08:41:35 -0000	1.9
  @@ -9,6 +9,8 @@
   
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.FileNameMapper;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Commandline;
  @@ -96,7 +98,6 @@
           String[] files = scanner.getIncludedFiles();
   
           final SourceFileScanner sfs = new SourceFileScanner();
  -        setupLogger( sfs );
           final FileNameMapper mapper = buildMapper();
           files = sfs.restrict( files, m_srcDir, m_destDir, mapper, getContext() );
           int count = files.length;
  @@ -108,7 +109,7 @@
           final String message = "Converting " + count + " file" +
               ( count != 1 ? "s" : "" ) + " from " + m_srcDir + " to " +
               m_destDir;
  -        getLogger().info( message );
  +        getContext().info( message );
   
           for( int i = 0; i < files.length; i++ )
           {
  @@ -192,7 +193,7 @@
               }
           }
   
  -        getLogger().debug( "converting " + srcName );
  +        getContext().debug( "converting " + srcName );
           sun.tools.native2ascii.Main n2a = new sun.tools.native2ascii.Main();
           if( !n2a.convert( cmd.getArguments() ) )
           {
  
  
  
  1.6       +5 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java
  
  Index: Replace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/Replace.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Replace.java	6 Feb 2002 13:38:22 -0000	1.5
  +++ Replace.java	11 Mar 2002 08:41:35 -0000	1.6
  @@ -25,6 +25,8 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.avalon.excalibur.util.StringUtil;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
   
  @@ -227,7 +229,7 @@
   
           if( m_summary )
           {
  -            getLogger().info( "Replaced " + m_replaceCount + " occurrences in " + m_fileCount + " files." );
  +            getContext().info( "Replaced " + m_replaceCount + " occurrences in " + m_fileCount + " files." );
           }
       }
   
  @@ -351,7 +353,7 @@
                   final String tok = stringReplace( m_token.getText(), "\n", StringUtil.LINE_SEPARATOR );
   
                   // for each found token, replace with value
  -                getLogger().debug( "Replacing in " + src.getPath() + ": " + m_token.getText() + " --> " + m_value.getText() );
  +                getContext().debug( "Replacing in " + src.getPath() + ": " + m_token.getText() + " --> " + m_value.getText() );
                   newString = stringReplace( newString, tok, val );
               }
   
  @@ -409,7 +411,7 @@
               Replacefilter filter = (Replacefilter)m_replacefilters.get( i );
   
               //for each found token, replace with value
  -            getLogger().debug( "Replacing in " + filename + ": " + filter.getToken() + " --> " + filter.getReplaceValue() );
  +            getContext().debug( "Replacing in " + filename + ": " + filter.getToken() + " --> " + filter.getReplaceValue() );
               newString = stringReplace( newString, filter.getToken(), filter.getReplaceValue() );
           }
   
  
  
  
  1.9       +6 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java
  
  Index: ReplaceRegExp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/text/ReplaceRegExp.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ReplaceRegExp.java	21 Feb 2002 09:41:55 -0000	1.8
  +++ ReplaceRegExp.java	11 Mar 2002 08:41:35 -0000	1.9
  @@ -18,6 +18,7 @@
   import java.util.ArrayList;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  @@ -216,14 +217,14 @@
               {
                   final String message = "An error occurred processing file: '" +
                       file.getAbsolutePath() + "': " + e.toString();
  -                getLogger().error( message, e );
  +                getContext().error( message, e );
               }
           }
           else if( file != null )
           {
               final String message =
                   "The following file is missing: '" + file.getAbsolutePath() + "'";
  -            getLogger().error( message );
  +            getContext().error( message );
           }
   
           int sz = filesets.size();
  @@ -246,13 +247,13 @@
                       {
                           final String message = "An error occurred processing file: '" + f.getAbsolutePath() +
                               "': " + e.toString();
  -                        getLogger().error( message );
  +                        getContext().error( message );
                       }
                   }
                   else
                   {
                       final String message = "The following file is missing: '" + file.getAbsolutePath() + "'";
  -                    getLogger().error( message );
  +                    getContext().error( message );
                   }
               }
           }
  @@ -308,7 +309,7 @@
                   ( byline ? " by line" : "" ) +
                   ( flags.length() > 0 ? " with flags: '" + flags + "'" : "" ) +
                   ".";
  -            getLogger().warn( message );
  +            getContext().warn( message );
   
               if( byline )
               {
  
  
  
  1.16      +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java
  
  Index: Rpm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Rpm.java	10 Feb 2002 01:01:11 -0000	1.15
  +++ Rpm.java	11 Mar 2002 08:41:36 -0000	1.16
  @@ -11,6 +11,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
  @@ -101,7 +102,7 @@
           exe.setReturnCode( 0 );
   
           final String message = "Building the RPM based on the " + m_specFile + " file";
  -        getLogger().info( message );
  +        getContext().info( message );
           exe.execute();
       }
   
  
  
  
  1.15      +2 -26     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java
  
  Index: FilterSet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/FilterSet.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- FilterSet.java	3 Mar 2002 07:09:30 -0000	1.14
  +++ FilterSet.java	11 Mar 2002 08:41:36 -0000	1.15
  @@ -15,7 +15,6 @@
   import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.Properties;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Filter;
   
  @@ -26,7 +25,7 @@
    * @author <A href="mailto:gholam@xtra.co.nz"> Michael McCallum </A>
    */
   public class FilterSet
  -    extends AbstractLogEnabled
  +    //extends AbstractLogEnabled
       implements Cloneable
   {
       /**
  @@ -133,7 +132,6 @@
       {
           if( filtersFile.isFile() )
           {
  -            getLogger().debug( "Reading filters from " + filtersFile );
               FileInputStream in = null;
               try
               {
  @@ -142,12 +140,11 @@
                   props.load( in );
   
                   Enumeration enum = props.propertyNames();
  -                ArrayList filters = m_filters;
                   while( enum.hasMoreElements() )
                   {
                       String strPropName = (String)enum.nextElement();
                       String strValue = props.getProperty( strPropName );
  -                    filters.add( new Filter( strPropName, strValue ) );
  +                    m_filters.add( new Filter( strPropName, strValue ) );
                   }
               }
               catch( Exception e )
  @@ -210,7 +207,6 @@
                   if( tokens.containsKey( token ) )
                   {
                       value = (String)tokens.get( token );
  -                    getLogger().debug( "Replacing: " + DEFAULT_TOKEN_START + token + DEFAULT_TOKEN_END + " -> " + value );
                       b.append( value );
                       i = index + DEFAULT_TOKEN_START.length() + token.length() + DEFAULT_TOKEN_END.length();
                   }
  @@ -228,26 +224,6 @@
           catch( StringIndexOutOfBoundsException e )
           {
               return line;
  -        }
  -    }
  -
  -    /**
  -     * The filtersfile nested element.
  -     *
  -     * @author Michael McCallum
  -     * @created Thursday, April 19, 2001
  -     */
  -    public class FiltersFile
  -    {
  -        /**
  -         * Sets the file from which filters will be read.
  -         *
  -         * @param file the file from which filters will be read.
  -         */
  -        public void setFile( final File file )
  -            throws TaskException
  -        {
  -            readFiltersFromFile( file );
           }
       }
   }
  
  
  
  1.7       +5 -7      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java
  
  Index: SourceFileScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/types/SourceFileScanner.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SourceFileScanner.java	4 Mar 2002 02:44:14 -0000	1.6
  +++ SourceFileScanner.java	11 Mar 2002 08:41:36 -0000	1.7
  @@ -12,7 +12,6 @@
   import java.util.Date;
   import org.apache.aut.nativelib.Os;
   import org.apache.avalon.excalibur.io.FileUtil;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.FileNameMapper;
  @@ -28,7 +27,6 @@
    * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
    */
   public class SourceFileScanner
  -    extends AbstractLogEnabled
   {
       /**
        * Restrict the given set of files to those that are newer than their
  @@ -72,7 +70,7 @@
               if( targets == null || targets.length == 0 )
               {
                   final String message = files[ i ] + " skipped - don\'t know how to handle it";
  -                getLogger().debug( message );
  +                context.debug( message );
                   continue;
               }
   
  @@ -80,7 +78,7 @@
               if( src.lastModified() > now )
               {
                   final String message = "Warning: " + files[ i ] + " modified in the future.";
  -                getLogger().warn( message );
  +                context.warn( message );
               }
   
               boolean added = false;
  @@ -93,7 +91,7 @@
                   {
                       final String message =
                           files[ i ] + " added as " + dest.getAbsolutePath() + " doesn\'t exist.";
  -                    getLogger().debug( message );
  +                    context.debug( message );
                       v.add( files[ i ] );
                       added = true;
                   }
  @@ -101,7 +99,7 @@
                   {
                       final String message =
                           files[ i ] + " added as " + dest.getAbsolutePath() + " is outdated.";
  -                    getLogger().debug( message );
  +                    context.debug( message );
                       v.add( files[ i ] );
                       added = true;
                   }
  @@ -119,7 +117,7 @@
               {
                   final String message = files[ i ] + " omitted as " + targetList.toString() +
                       ( targets.length == 1 ? " is" : " are " ) + " up to date.";
  -                getLogger().debug( message );
  +                context.debug( message );
               }
   
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message