ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSSCHECKIN.java MSVSSCHECKOUT.java MSVSSGET.java
Date Sun, 16 Dec 2001 05:44:57 GMT
donaldp     01/12/15 21:44:57

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant
                        ProjectComponent.java Task.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        BUnzip2.java Checksum.java Copy.java Delete.java
                        GUnzip.java GenerateKey.java Get.java Javac.java
                        Mkdir.java Move.java Pack.java SQLExec.java
                        SendEmail.java SignJar.java XSLTProcess.java
                        Zip.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
                        Cab.java IContract.java Javah.java
                        ManifestFile.java Native2Ascii.java NetRexxC.java
                        PropertyFile.java Rpm.java XMLValidateTask.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend
                        Depend.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        CSharp.java Ilasm.java NetCommand.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        BorlandGenerateClient.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc
                        JJTree.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jdepend
                        JDependTask.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink
                        JlinkTask.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
                        AggregateTransformer.java XalanExecutor.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        MParse.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net
                        FTP.java MimeMail.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
                        CovReport.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSSCHECKIN.java MSVSSCHECKOUT.java MSVSSGET.java
  Log:
  log() --> getLogger().info()
  
  Revision  Changes    Path
  1.5       +1 -11     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java
  
  Index: ProjectComponent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/ProjectComponent.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProjectComponent.java	2001/12/16 02:05:41	1.4
  +++ ProjectComponent.java	2001/12/16 05:44:55	1.5
  @@ -22,7 +22,7 @@
   public abstract class ProjectComponent
       extends AbstractTask
   {
  -    protected Project project = null;
  +    protected Project project;
   
       /**
        * Sets the project object of this component. This method is used by project
  @@ -56,16 +56,6 @@
           throws TaskException
       {
           return FileUtils.newFileUtils().resolveFile( project.getBaseDir(), name );
  -    }
  -
  -    /**
  -     * Log a message with the default (INFO) priority.
  -     *
  -     * @param msg Description of Parameter
  -     */
  -    public void log( String msg )
  -    {
  -        log( msg, Project.MSG_INFO );
       }
   
       /**
  
  
  
  1.13      +0 -10     jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/Task.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Task.java	2001/12/16 05:33:57	1.12
  +++ Task.java	2001/12/16 05:44:55	1.13
  @@ -37,16 +37,6 @@
       }
   
       /**
  -     * Log a message with the default (INFO) priority.
  -     *
  -     * @param msg Description of Parameter
  -     */
  -    public void log( String msg )
  -    {
  -        log( msg, Project.MSG_INFO );
  -    }
  -
  -    /**
        * Log a mesage with the give priority.
        *
        * @param msgLevel the message priority at which this message is to be
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java
  
  Index: BUnzip2.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/BUnzip2.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BUnzip2.java	2001/12/16 01:01:19	1.4
  +++ BUnzip2.java	2001/12/16 05:44:55	1.5
  @@ -36,7 +36,7 @@
       {
           if( source.lastModified() > dest.lastModified() )
           {
  -            log( "Expanding " + source.getAbsolutePath() + " to "
  +            getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
                    + dest.getAbsolutePath() );
   
               FileOutputStream out = null;
  
  
  
  1.4       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java
  
  Index: Checksum.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Checksum.java	2001/12/16 00:38:01	1.3
  +++ Checksum.java	2001/12/16 05:44:55	1.4
  @@ -230,7 +230,7 @@
                   String message = "Could not find file "
                       + file.getAbsolutePath()
                       + " to generate checksum for.";
  -                log( message );
  +                getLogger().info( message );
                   throw new TaskException( message );
               }
           }
  @@ -256,7 +256,7 @@
                   File src = (File)e.nextElement();
                   if( !isCondition )
                   {
  -                    log( "Calculating " + algorithm + " checksum for " + src );
  +                    getLogger().info( "Calculating " + algorithm + " checksum for " + src );
                   }
                   fis = new FileInputStream( src );
                   DigestInputStream dis = new DigestInputStream( fis,
  
  
  
  1.6       +3 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java
  
  Index: Copy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Copy.java	2001/12/16 01:31:37	1.5
  +++ Copy.java	2001/12/16 05:44:55	1.6
  @@ -243,7 +243,7 @@
               {
                   String message = "Could not find file "
                       + file.getAbsolutePath() + " to copy.";
  -                log( message );
  +                getLogger().info( message );
                   throw new TaskException( message );
               }
           }
  @@ -334,7 +334,7 @@
       {
           if( fileCopyMap.size() > 0 )
           {
  -            log( "Copying " + fileCopyMap.size() +
  +            getLogger().info( "Copying " + fileCopyMap.size() +
                    " file" + ( fileCopyMap.size() == 1 ? "" : "s" ) +
                    " to " + destDir.getAbsolutePath() );
   
  @@ -397,7 +397,7 @@
   
               if( count > 0 )
               {
  -                log( "Copied " + count +
  +                getLogger().info( "Copied " + count +
                        " empty director" +
                        ( count == 1 ? "y" : "ies" ) +
                        " to " + destDir.getAbsolutePath() );
  
  
  
  1.6       +6 -6      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java
  
  Index: Delete.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Delete.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Delete.java	2001/12/16 01:31:37	1.5
  +++ Delete.java	2001/12/16 05:44:55	1.6
  @@ -239,7 +239,7 @@
       {
           if( usedMatchingTask )
           {
  -            log( "DEPRECATED - Use of the implicit FileSet is deprecated.  Use a nested fileset element instead." );
  +            getLogger().info( "DEPRECATED - Use of the implicit FileSet is deprecated.  Use a nested fileset element instead." );
           }
   
           if( file == null && dir == null && filesets.size() == 0 )
  @@ -259,11 +259,11 @@
               {
                   if( file.isDirectory() )
                   {
  -                    log( "Directory " + file.getAbsolutePath() + " cannot be removed using the file attribute.  Use dir instead." );
  +                    getLogger().info( "Directory " + file.getAbsolutePath() + " cannot be removed using the file attribute.  Use dir instead." );
                   }
                   else
                   {
  -                    log( "Deleting: " + file.getAbsolutePath() );
  +                    getLogger().info( "Deleting: " + file.getAbsolutePath() );
   
                       if( !file.delete() )
                       {
  @@ -294,7 +294,7 @@
                */
               if( verbosity == Project.MSG_VERBOSE )
               {
  -                log( "Deleting directory " + dir.getAbsolutePath() );
  +                getLogger().info( "Deleting directory " + dir.getAbsolutePath() );
               }
               removeDir( dir );
           }
  @@ -408,7 +408,7 @@
       {
           if( files.length > 0 )
           {
  -            log( "Deleting " + files.length + " files from " + d.getAbsolutePath() );
  +            getLogger().info( "Deleting " + files.length + " files from " + d.getAbsolutePath() );
               for( int j = 0; j < files.length; j++ )
               {
                   File f = new File( d, files[ j ] );
  @@ -454,7 +454,7 @@
   
               if( dirCount > 0 )
               {
  -                log( "Deleted " + dirCount + " director" +
  +                getLogger().info( "Deleted " + dirCount + " director" +
                        ( dirCount == 1 ? "y" : "ies" ) +
                        " from " + d.getAbsolutePath() );
               }
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java
  
  Index: GUnzip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GUnzip.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GUnzip.java	2001/12/16 01:01:19	1.4
  +++ GUnzip.java	2001/12/16 05:44:55	1.5
  @@ -36,7 +36,7 @@
       {
           if( source.lastModified() > dest.lastModified() )
           {
  -            log( "Expanding " + source.getAbsolutePath() + " to "
  +            getLogger().info( "Expanding " + source.getAbsolutePath() + " to "
                    + dest.getAbsolutePath() );
   
               FileOutputStream out = null;
  
  
  
  1.7       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GenerateKey.java	2001/12/16 05:05:24	1.6
  +++ GenerateKey.java	2001/12/16 05:44:55	1.7
  @@ -160,7 +160,7 @@
               throw new TaskException( "dname must be set" );
           }
   
  -        log( "Generating Key for " + alias );
  +        getLogger().info( "Generating Key for " + alias );
           final ExecTask cmd = (ExecTask)project.createTask( "exec" );
           cmd.setExecutable( "keytool" );
   
  
  
  
  1.7       +8 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Get.java	2001/12/16 04:34:14	1.6
  +++ Get.java	2001/12/16 05:44:55	1.7
  @@ -151,7 +151,7 @@
   
           try
           {
  -            log( "Getting: " + source );
  +            getLogger().info( "Getting: " + source );
   
               //set the timestamp to the file date.
               long timestamp = 0;
  @@ -163,7 +163,7 @@
                   if( verbose )
                   {
                       Date t = new Date( timestamp );
  -                    log( "local file date : " + t.toString() );
  +                    getLogger().info( "local file date : " + t.toString() );
                   }
   
                   hasTimestamp = true;
  @@ -209,13 +209,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
  -                    log( "Not modified - so not downloaded" );
  +                    getLogger().info( "Not modified - so not downloaded" );
                       return;
                   }
                   // test for 401 result (HTTP only)
                   if( httpConnection.getResponseCode() == HttpURLConnection.HTTP_UNAUTHORIZED )
                   {
  -                    log( "Not authorized - check " + dest + " for details" );
  +                    getLogger().info( "Not authorized - check " + dest + " for details" );
                       return;
                   }
   
  @@ -237,12 +237,12 @@
                   }
                   catch( IOException ex )
                   {
  -                    log( "Error opening connection " + ex );
  +                    getLogger().info( "Error opening connection " + ex );
                   }
               }
               if( is == null )
               {
  -                log( "Can't get " + source + " to " + dest );
  +                getLogger().info( "Can't get " + source + " to " + dest );
                   if( ignoreErrors )
                       return;
                   throw new TaskException( "Can't get " + source + " to " + dest );
  @@ -270,7 +270,7 @@
                   if( verbose )
                   {
                       Date t = new Date( remoteTimestamp );
  -                    log( "last modified = " + t.toString()
  +                    getLogger().info( "last modified = " + t.toString()
                            + ( ( remoteTimestamp == 0 ) ? " - using current time instead" : "" ) );
                   }
                   if( remoteTimestamp != 0 )
  @@ -279,7 +279,7 @@
           }
           catch( IOException ioe )
           {
  -            log( "Error getting " + source + " to " + dest );
  +            getLogger().info( "Error getting " + source + " to " + dest );
               if( ignoreErrors )
                   return;
               throw new TaskException( "Error", ioe );
  
  
  
  1.7       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Javac.java	2001/12/16 02:05:41	1.6
  +++ Javac.java	2001/12/16 05:44:55	1.7
  @@ -774,7 +774,7 @@
   
               CompilerAdapter adapter = CompilerAdapterFactory.getCompiler(
                   compiler, this );
  -            log( "Compiling " + compileList.length +
  +            getLogger().info( "Compiling " + compileList.length +
                    " source file"
                    + ( compileList.length == 1 ? "" : "s" )
                    + ( destDir != null ? " to " + destDir : "" ) );
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
  
  Index: Mkdir.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Mkdir.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Mkdir.java	2001/12/16 00:38:01	1.3
  +++ Mkdir.java	2001/12/16 05:44:55	1.4
  @@ -49,7 +49,7 @@
                       "successful for an unknown reason";
                   throw new TaskException( msg );
               }
  -            log( "Created dir: " + dir.getAbsolutePath() );
  +            getLogger().info( "Created dir: " + dir.getAbsolutePath() );
           }
       }
   }
  
  
  
  1.5       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Move.java
  
  Index: Move.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Move.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Move.java	2001/12/16 02:05:41	1.4
  +++ Move.java	2001/12/16 05:44:55	1.5
  @@ -105,7 +105,7 @@
           }
           if( fileCopyMap.size() > 0 )
           {// files to move
  -            log( "Moving " + fileCopyMap.size() + " files to " +
  +            getLogger().info( "Moving " + fileCopyMap.size() + " files to " +
                    destDir.getAbsolutePath() );
   
               Enumeration e = fileCopyMap.keys();
  @@ -200,7 +200,7 @@
   
               if( count > 0 )
               {
  -                log( "Moved " + count + " empty directories to " + destDir.getAbsolutePath() );
  +                getLogger().info( "Moved " + count + " empty directories to " + destDir.getAbsolutePath() );
               }
           }
   
  
  
  
  1.6       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Pack.java
  
  Index: Pack.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Pack.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Pack.java	2001/12/16 01:31:38	1.5
  +++ Pack.java	2001/12/16 05:44:55	1.6
  @@ -41,7 +41,7 @@
           throws TaskException
       {
           validate();
  -        log( "Building: " + zipFile.getAbsolutePath() );
  +        getLogger().info( "Building: " + zipFile.getAbsolutePath() );
           pack();
       }
   
  
  
  
  1.6       +1 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SQLExec.java	2001/12/16 02:05:41	1.5
  +++ SQLExec.java	2001/12/16 05:44:55	1.6
  @@ -579,7 +579,7 @@
               }
           }
   
  -        log( goodSql + " of " + totalSql +
  +        getLogger().info( goodSql + " of " + totalSql +
                " SQL statements executed successfully" );
       }
   
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java
  
  Index: SendEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SendEmail.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SendEmail.java	2001/12/16 00:38:01	1.3
  +++ SendEmail.java	2001/12/16 05:44:55	1.4
  @@ -390,7 +390,7 @@
                   throw new TaskException( "Attribute \"file\" or \"message\" is required." );
               }
   
  -            log( "Sending email" );
  +            getLogger().info( "Sending email" );
               mailMessage.sendAndClose();
           }
           catch( IOException ioe )
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SignJar.java	2001/12/16 04:12:39	1.3
  +++ SignJar.java	2001/12/16 05:44:55	1.4
  @@ -326,7 +326,7 @@
   
           cmd.createArg().setValue( alias );
   
  -        log( "Signing Jar : " + jarSource.getAbsolutePath() );
  +        getLogger().info( "Signing Jar : " + jarSource.getAbsolutePath() );
           cmd.setFailonerror( true );
           cmd.execute();
       }
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
  
  Index: XSLTProcess.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSLTProcess.java	2001/12/16 02:05:41	1.4
  +++ XSLTProcess.java	2001/12/16 05:44:55	1.5
  @@ -445,7 +445,7 @@
                   styleSheetLastModified > outFile.lastModified() )
               {
                   ensureDirectoryFor( outFile );
  -                log( "Processing " + inFile + " to " + outFile );
  +                getLogger().info( "Processing " + inFile + " to " + outFile );
   
                   configureLiaison( stylesheet );
                   liaison.transform( inFile, outFile );
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Zip.java	2001/12/16 01:31:38	1.4
  +++ Zip.java	2001/12/16 05:44:55	1.5
  @@ -276,7 +276,7 @@
   
           String action = doUpdate ? "Updating " : "Building ";
   
  -        log( action + archiveType + ": " + zipFile.getAbsolutePath() );
  +        getLogger().info( action + archiveType + ": " + zipFile.getAbsolutePath() );
   
           boolean success = false;
           try
  
  
  
  1.7       +1 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Cab.java	2001/12/16 05:24:32	1.6
  +++ Cab.java	2001/12/16 05:44:55	1.7
  @@ -117,7 +117,7 @@
           if( isUpToDate( files ) )
               return;
   
  -        log( "Building " + archiveType + ": " + cabFile.getAbsolutePath() );
  +        getLogger().info( "Building " + archiveType + ": " + cabFile.getAbsolutePath() );
   
           if( !Os.isFamily( "windows" ) )
           {
  
  
  
  1.6       +12 -12    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- IContract.java	2001/12/16 04:12:39	1.5
  +++ IContract.java	2001/12/16 05:44:55	1.6
  @@ -527,7 +527,7 @@
       {
           if( !controlFile.exists() )
           {
  -            log( "WARNING: Control file " + controlFile.getAbsolutePath() + " doesn't exist. iContract will be run without control file." );
  +            getLogger().info( "WARNING: Control file " + controlFile.getAbsolutePath() + " doesn't exist. iContract will be run without control file." );
           }
           this.controlFile = controlFile;
       }
  @@ -710,7 +710,7 @@
               // issue warning if pre,post or invariant is used together with controlfile
               if( ( pre || post || invariant ) && controlFile != null )
               {
  -                log( "WARNING: specifying pre,post or invariant will override control file settings" );
  +                getLogger().info( "WARNING: specifying pre,post or invariant will override control file settings" );
               }
   
   
  @@ -796,7 +796,7 @@
                   }
                   catch( IOException e )
                   {
  -                    log( "File icontrol.properties not found. That's ok. Writing a default one." );
  +                    getLogger().info( "File icontrol.properties not found. That's ok. Writing a default one." );
                   }
                   iControlProps.setProperty( "sourceRoot", srcDir.getAbsolutePath() );
                   iControlProps.setProperty( "classRoot", classDir.getAbsolutePath() );
  @@ -807,11 +807,11 @@
                   try
                   {// to read existing propertiesfile
                       iControlProps.store( new FileOutputStream( "icontrol.properties" ), ICONTROL_PROPERTIES_HEADER );
  -                    log( "Updated icontrol.properties" );
  +                    getLogger().info( "Updated icontrol.properties" );
                   }
                   catch( IOException e )
                   {
  -                    log( "Couldn't write icontrol.properties." );
  +                    getLogger().info( "Couldn't write icontrol.properties." );
                   }
               }
   
  @@ -821,9 +821,9 @@
               {
                   if( iContractMissing )
                   {
  -                    log( "iContract can't be found on your classpath. Your classpath is:" );
  -                    log( classpath.toString() );
  -                    log( "If you don't have the iContract jar, go get it at http://www.reliable-systems.com/tools/" );
  +                    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/" );
                   }
                   throw new TaskException( "iContract instrumentation failed. Code=" + result );
               }
  @@ -948,17 +948,17 @@
               if( targets == null )
               {
                   targets = new File( "targets" );
  -                log( "Warning: targets file not specified. generating file: " + targets.getName() );
  +                getLogger().info( "Warning: targets file not specified. generating file: " + targets.getName() );
                   writeTargets = true;
               }
               else if( !targets.exists() )
               {
  -                log( "Specified targets file doesn't exist. generating file: " + targets.getName() );
  +                getLogger().info( "Specified targets file doesn't exist. generating file: " + targets.getName() );
                   writeTargets = true;
               }
               if( writeTargets )
               {
  -                log( "You should consider using iControl to create a target file." );
  +                getLogger().info( "You should consider using iControl to create a target file." );
                   targetOutputStream = new FileOutputStream( targets );
                   targetPrinter = new PrintStream( targetOutputStream );
               }
  @@ -1018,7 +1018,7 @@
                               {
                                   if( !dirty )
                                   {
  -                                    log( "Control file " + controlFile.getAbsolutePath() + " has been updated. Instrumenting all files..." );
  +                                    getLogger().info( "Control file " + controlFile.getAbsolutePath() + " has been updated. Instrumenting all files..." );
                                   }
                                   dirty = true;
                                   instrumentall = true;
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Javah.java	2001/12/16 00:33:54	1.3
  +++ Javah.java	2001/12/16 05:44:55	1.4
  @@ -459,7 +459,7 @@
           public void setName( String name )
           {
               this.name = name;
  -            log( "ClassArgument.name=" + name );
  +            getLogger().info( "ClassArgument.name=" + name );
           }
   
           public String getName()
  
  
  
  1.4       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java
  
  Index: ManifestFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ManifestFile.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ManifestFile.java	2001/12/16 00:33:54	1.3
  +++ ManifestFile.java	2001/12/16 05:44:55	1.4
  @@ -186,7 +186,7 @@
   
           if( manifestFile.exists() )
           {
  -            this.log( "update existing manifest file " + manifestFile.getAbsolutePath() );
  +            getLogger().info( "update existing manifest file " + manifestFile.getAbsolutePath() );
   
               if( container != null )
               {
  @@ -234,7 +234,7 @@
           try
           {
               manifestFile.delete();
  -            log( "Replacing or creating new manifest file " + manifestFile.getAbsolutePath() );
  +            getLogger().info( "Replacing or creating new manifest file " + manifestFile.getAbsolutePath() );
               if( manifestFile.createNewFile() )
               {
                   FileOutputStream fos = new FileOutputStream( manifestFile );
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  
  Index: Native2Ascii.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Native2Ascii.java	2001/12/16 00:33:54	1.3
  +++ Native2Ascii.java	2001/12/16 05:44:55	1.4
  @@ -163,7 +163,7 @@
           }
           String message = "Converting " + count + " file"
               + ( count != 1 ? "s" : "" ) + " from ";
  -        log( message + srcDir + " to " + destDir );
  +        getLogger().info( message + srcDir + " to " + destDir );
           for( int i = 0; i < files.length; i++ )
           {
               convert( files[ i ], m.mapFileName( files[ i ] )[ 0 ] );
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NetRexxC.java	2001/12/16 00:33:54	1.3
  +++ NetRexxC.java	2001/12/16 05:44:55	1.4
  @@ -500,7 +500,7 @@
           // compile the source files
           if( compileList.size() > 0 )
           {
  -            log( "Compiling " + compileList.size() + " source file"
  +            getLogger().info( "Compiling " + compileList.size() + " source file"
                    + ( compileList.size() == 1 ? "" : "s" )
                    + " to " + destDir );
               doNetRexxCompile();
  @@ -610,7 +610,7 @@
       {
           if( filecopyList.size() > 0 )
           {
  -            log( "Copying " + filecopyList.size() + " file"
  +            getLogger().info( "Copying " + filecopyList.size() + " file"
                    + ( filecopyList.size() == 1 ? "" : "s" )
                    + " to " + destDir.getAbsolutePath() );
               Enumeration enum = filecopyList.keys();
  
  
  
  1.4       +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java
  
  Index: PropertyFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/PropertyFile.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropertyFile.java	2001/12/16 00:33:54	1.3
  +++ PropertyFile.java	2001/12/16 05:44:55	1.4
  @@ -228,7 +228,7 @@
           {
               if( m_propertyfile.exists() )
               {
  -                log( "Updating property file: " + m_propertyfile.getAbsolutePath() );
  +                getLogger().info( "Updating property file: " + m_propertyfile.getAbsolutePath() );
                   FileInputStream fis = null;
                   try
                   {
  @@ -246,7 +246,7 @@
               }
               else
               {
  -                log( "Creating new property file: " +
  +                getLogger().info( "Creating new property file: " +
                        m_propertyfile.getAbsolutePath() );
                   FileOutputStream out = null;
                   try
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java
  
  Index: Rpm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Rpm.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Rpm.java	2001/12/16 02:05:42	1.4
  +++ Rpm.java	2001/12/16 05:44:55	1.5
  @@ -198,7 +198,7 @@
           try
           {
               exe.execute();
  -            log( "Building the RPM based on the " + specFile + " file" );
  +            getLogger().info( "Building the RPM based on the " + specFile + " file" );
           }
           catch( IOException e )
           {
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java
  
  Index: XMLValidateTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLValidateTask.java	2001/12/16 02:05:42	1.3
  +++ XMLValidateTask.java	2001/12/16 05:44:55	1.4
  @@ -270,7 +270,7 @@
                   fileProcessed++;
               }
           }
  -        log( fileProcessed + " file(s) have been successfully validated." );
  +        getLogger().info( fileProcessed + " file(s) have been successfully validated." );
       }
   
       protected EntityResolver getEntityResolver()
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java
  
  Index: Depend.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/depend/Depend.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Depend.java	2001/12/16 02:05:42	1.4
  +++ Depend.java	2001/12/16 05:44:56	1.5
  @@ -308,7 +308,7 @@
               int count = deleteAllAffectedFiles();
   
               long duration = ( System.currentTimeMillis() - start ) / 1000;
  -            log( "Deleted " + count + " out of date files in " + duration + " seconds" );
  +            getLogger().info( "Deleted " + count + " out of date files in " + duration + " seconds" );
           }
           catch( Exception e )
           {
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java
  
  Index: CSharp.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CSharp.java	2001/12/16 02:05:42	1.4
  +++ CSharp.java	2001/12/16 05:44:56	1.5
  @@ -682,7 +682,7 @@
           //get dependencies list.
           DirectoryScanner scanner = super.getDirectoryScanner( _srcDir );
           String[] dependencies = scanner.getIncludedFiles();
  -        log( "compiling " + dependencies.length + " file" + ( ( dependencies.length == 1 ) ? "" : "s" ) );
  +        getLogger().info( "compiling " + dependencies.length + " file" + ( ( dependencies.length == 1 ) ? "" : "s" ) );
           String baseDir = scanner.getBasedir().toString();
           //add to the command
           for( int i = 0; i < dependencies.length; i++ )
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java
  
  Index: Ilasm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Ilasm.java	2001/12/16 02:05:42	1.4
  +++ Ilasm.java	2001/12/16 05:44:56	1.5
  @@ -312,7 +312,7 @@
           //get dependencies list.
           DirectoryScanner scanner = super.getDirectoryScanner( _srcDir );
           String[] dependencies = scanner.getIncludedFiles();
  -        log( "assembling " + dependencies.length + " file" + ( ( dependencies.length == 1 ) ? "" : "s" ) );
  +        getLogger().info( "assembling " + dependencies.length + " file" + ( ( dependencies.length == 1 ) ? "" : "s" ) );
           String baseDir = scanner.getBasedir().toString();
           //add to the command
           for( int i = 0; i < dependencies.length; i++ )
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java
  
  Index: NetCommand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- NetCommand.java	2001/12/16 02:05:42	1.4
  +++ NetCommand.java	2001/12/16 05:44:56	1.5
  @@ -146,7 +146,7 @@
           {
               if( _traceCommandLine )
               {
  -                _owner.log( _commandLine.toString() );
  +                //_owner.getLogger().info( _commandLine.toString() );
               }
               else
               {
  
  
  
  1.4       +4 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java
  
  Index: BorlandGenerateClient.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BorlandGenerateClient.java	2001/12/16 02:05:42	1.3
  +++ BorlandGenerateClient.java	2001/12/16 05:44:56	1.4
  @@ -132,11 +132,11 @@
   
           if( mode == null )
           {
  -            log( "mode is null default mode  is java" );
  +            getLogger().info( "mode is null default mode  is java" );
               setMode( JAVA_MODE );
           }// end of if ()
   
  -        log( "client jar file is " + clientjarfile );
  +        getLogger().info( "client jar file is " + clientjarfile );
   
           if( mode.equalsIgnoreCase( FORK_MODE ) )
           {
  @@ -158,7 +158,7 @@
       {
           try
           {
  -            log( "mode : fork" );
  +            getLogger().info( "mode : fork" );
   
               org.apache.tools.ant.taskdefs.ExecTask execTask = null;
               execTask = (ExecTask)getProject().createTask( "exec" );
  @@ -203,7 +203,7 @@
       {
           try
           {
  -            log( "mode : java" );
  +            getLogger().info( "mode : java" );
   
               org.apache.tools.ant.taskdefs.Java execTask = null;
               execTask = (Java)getProject().createTask( "java" );
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JJTree.java	2001/12/16 04:47:48	1.3
  +++ JJTree.java	2001/12/16 05:44:56	1.4
  @@ -166,7 +166,7 @@
                                           targetName.substring( 0, targetName.indexOf( ".jjt" ) ) + ".jj" );
           if( javaFile.exists() && target.lastModified() < javaFile.lastModified() )
           {
  -            log( "Target is already built - skipping (" + target + ")" );
  +            getLogger().info( "Target is already built - skipping (" + target + ")" );
               return;
           }
           cmdl.createArgument().setValue( target.getAbsolutePath() );
  
  
  
  1.4       +5 -5      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JDependTask.java	2001/12/16 00:36:24	1.3
  +++ JDependTask.java	2001/12/16 05:44:56	1.4
  @@ -344,7 +344,7 @@
           }
   
           if( getOutputFile() != null )
  -            log( "Output to be stored in " + getOutputFile().getPath() );
  +            getLogger().info( "Output to be stored in " + getOutputFile().getPath() );
           log( "Executing: " + commandline.toString(), Project.MSG_VERBOSE );
           try
           {
  @@ -389,11 +389,11 @@
               catch( IOException e )
               {
                   String msg = "JDepend Failed when creating the output file: " + e.getMessage();
  -                log( msg );
  +                getLogger().info( msg );
                   throw new TaskException( msg );
               }
               jdepend.setWriter( new PrintWriter( fw ) );
  -            log( "Output to be stored in " + getOutputFile().getPath() );
  +            getLogger().info( "Output to be stored in " + getOutputFile().getPath() );
           }
   
           PathTokenizer sourcesPath = new PathTokenizer( getSourcespath().toString() );
  @@ -405,7 +405,7 @@
               if( !f.exists() || !f.isDirectory() )
               {
                   String msg = "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail.";
  -                log( msg );
  +                getLogger().info( msg );
                   throw new TaskException( msg );
               }
               try
  @@ -415,7 +415,7 @@
               catch( IOException e )
               {
                   String msg = "JDepend Failed when adding a source directory: " + e.getMessage();
  -                log( msg );
  +                getLogger().info( msg );
                   throw new TaskException( msg );
               }
           }
  
  
  
  1.5       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java
  
  Index: JlinkTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JlinkTask.java	2001/12/16 02:05:42	1.4
  +++ JlinkTask.java	2001/12/16 05:44:56	1.5
  @@ -157,7 +157,7 @@
           {
               throw new TaskException( "addfiles or mergefiles required! Please set." );
           }
  -        log( "linking:     " + outfile.getPath() );
  +        getLogger().info( "linking:     " + outfile.getPath() );
           log( "compression: " + compress, Project.MSG_VERBOSE );
           jlink linker = new jlink();
           linker.setOutfile( outfile.getPath() );
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JspC.java	2001/12/16 02:05:42	1.4
  +++ JspC.java	2001/12/16 05:44:56	1.5
  @@ -58,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.4 $ $Date: 2001/12/16 02:05:42 $
  + * @version $Revision: 1.5 $ $Date: 2001/12/16 05:44:56 $
    */
   public class JspC extends MatchingTask
   {
  @@ -388,7 +388,7 @@
   
               CompilerAdapter adapter =
                   CompilerAdapterFactory.getCompiler( compiler, this );
  -            log( "Compiling " + compileList.size() +
  +            getLogger().info( "Compiling " + compileList.size() +
                    " source file"
                    + ( compileList.size() == 1 ? "" : "s" )
                    + ( destDir != null ? " to " + destDir : "" ) );
  
  
  
  1.7       +1 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WLJspc.java	2001/12/16 05:01:13	1.6
  +++ WLJspc.java	2001/12/16 05:44:56	1.7
  @@ -197,7 +197,7 @@
           args[ j++ ] = compileClasspath.toString();
   
           this.scanDir( files );
  -        log( "Compiling " + filesToDo.size() + " JSP files" );
  +        getLogger().info( "Compiling " + filesToDo.size() + " JSP files" );
   
           for( int i = 0; i < filesToDo.size(); i++ )
           {
  
  
  
  1.4       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
  
  Index: AggregateTransformer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AggregateTransformer.java	2001/12/16 00:36:00	1.3
  +++ AggregateTransformer.java	2001/12/16 05:44:56	1.4
  @@ -134,7 +134,7 @@
               throw new TaskException( "Errors while applying transformations", e );
           }
           final long dt = System.currentTimeMillis() - t0;
  -        task.log( "Transform time: " + dt + "ms" );
  +        //task.getLogger().info( "Transform time: " + dt + "ms" );
       }
   
       /**
  
  
  
  1.3       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
  
  Index: XalanExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XalanExecutor.java	2001/12/16 00:36:00	1.2
  +++ XalanExecutor.java	2001/12/16 05:44:56	1.3
  @@ -62,7 +62,7 @@
               }
           }
           String version = getXalanVersion( procVersion );
  -        caller.task.log( "Using Xalan version: " + version );
  +        //caller.task.getLogger().info( "Using Xalan version: " + version );
           executor.setCaller( caller );
           return executor;
       }
  
  
  
  1.5       +2 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MParse.java	2001/12/16 04:47:49	1.4
  +++ MParse.java	2001/12/16 05:44:56	1.5
  @@ -301,7 +301,7 @@
           File javaFile = new File( pathname );
           if( javaFile.exists() && target.lastModified() < javaFile.lastModified() )
           {
  -            log( "Target is already build - skipping (" + target + ")" );
  +            getLogger().info( "Target is already build - skipping (" + target + ")" );
               return;
           }
   
  @@ -372,7 +372,7 @@
               final File sunjj = new File( target.getParent(), name );
               if( sunjj.exists() )
               {
  -                log( "Removing stale file: " + sunjj.getName() );
  +                getLogger().info( "Removing stale file: " + sunjj.getName() );
                   sunjj.delete();
               }
           }
  
  
  
  1.4       +10 -10    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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FTP.java	2001/12/16 00:35:13	1.3
  +++ FTP.java	2001/12/16 05:44:56	1.4
  @@ -352,7 +352,7 @@
                               ftp.getReplyString() );
                       }
                   }
  -                log( ACTION_STRS[ action ] + " files" );
  +                getLogger().info( ACTION_STRS[ action ] + " files" );
                   transferFiles( ftp );
               }
   
  @@ -405,7 +405,7 @@
   
               if( verbose )
               {
  -                log( "transferring " + filename + " to " + file.getAbsolutePath() );
  +                getLogger().info( "transferring " + filename + " to " + file.getAbsolutePath() );
               }
   
               File pdir = new File( file.getParent() );// stay 1.1 compatible
  @@ -595,7 +595,7 @@
       {
           if( verbose )
           {
  -            log( "deleting " + filename );
  +            getLogger().info( "deleting " + filename );
           }
   
           if( !ftp.deleteFile( resolveFile( filename ) ) )
  @@ -636,7 +636,7 @@
       {
           if( verbose )
           {
  -            log( "listing " + filename );
  +            getLogger().info( "listing " + filename );
           }
   
           FTPFile ftpfile = ftp.listFiles( resolveFile( filename ) )[ 0 ];
  @@ -659,7 +659,7 @@
       {
           if( verbose )
           {
  -            log( "creating directory: " + dir );
  +            getLogger().info( "creating directory: " + dir );
           }
   
           if( !ftp.makeDirectory( dir ) )
  @@ -677,14 +677,14 @@
   
               if( verbose )
               {
  -                log( "directory already exists" );
  +                getLogger().info( "directory already exists" );
               }
           }
           else
           {
               if( verbose )
               {
  -                log( "directory created OK" );
  +                getLogger().info( "directory created OK" );
               }
           }
       }
  @@ -733,7 +733,7 @@
   
               if( verbose )
               {
  -                log( "transferring " + file.getAbsolutePath() );
  +                getLogger().info( "transferring " + file.getAbsolutePath() );
               }
   
               instream = new BufferedInputStream( new FileInputStream( file ) );
  @@ -907,10 +907,10 @@
               }
           }
   
  -        log( transferred + " files " + COMPLETED_ACTION_STRS[ action ] );
  +        getLogger().info( transferred + " files " + COMPLETED_ACTION_STRS[ action ] );
           if( skipped != 0 )
           {
  -            log( skipped + " files were not successfully " + COMPLETED_ACTION_STRS[ action ] );
  +            getLogger().info( skipped + " files were not successfully " + COMPLETED_ACTION_STRS[ action ] );
           }
       }
   
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- MimeMail.java	2001/12/16 00:35:13	1.3
  +++ MimeMail.java	2001/12/16 05:44:56	1.4
  @@ -334,7 +334,7 @@
           }// for i
   
           msg.setContent( attachments );
  -        log( "sending email " );
  +        getLogger().info( "sending email " );
           Transport.send( msg );
       }
   
  
  
  
  1.3       +7 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AntStarTeamCheckOut.java	2001/12/16 00:34:44	1.2
  +++ AntStarTeamCheckOut.java	2001/12/16 05:44:57	1.3
  @@ -621,7 +621,7 @@
           // send the message to the project log.
   
           // Tell how many files were checked out.
  -        log( checkedOut + " files checked out." );
  +        getLogger().info( checkedOut + " files checked out." );
       }
   
       /**
  @@ -856,7 +856,7 @@
                   {
                       strFolder = strFolder.substring( i + 1 );
                   }
  -                log( "            Folder: \"" + strFolder + "\"" );
  +                getLogger().info( "            Folder: \"" + strFolder + "\"" );
                   prevFolder = f;
   
                   // If we displayed the project, view, item type, or folder,
  @@ -867,7 +867,7 @@
                   {
                       header.append( ",\t" ).append( p2.getDisplayName() );
                   }
  -                log( header.toString() );
  +                getLogger().info( header.toString() );
               }
   
               // Finally, show the Item properties ...
  @@ -896,7 +896,7 @@
               {
                   itemLine.append( ",\tNot locked" );
               }
  -            log( itemLine.toString() );
  +            getLogger().info( itemLine.toString() );
           }
           // END VERBOSE ONLY
   
  @@ -936,7 +936,7 @@
               {
                   if( getVerbose() )
                   {
  -                    log( "Found " + getProjectName() + delim + getViewName() + delim );
  +                    getLogger().info( "Found " + getProjectName() + delim + getViewName() + delim );
                   }
                   runType( s, p, v, s.typeForName( (String)s.getTypeNames().FILE ) );
                   break;
  @@ -960,7 +960,7 @@
               {
                   if( getVerbose() )
                   {
  -                    log( "Found " + getProjectName() + delim );
  +                    getLogger().info( "Found " + getProjectName() + delim );
                   }
                   runProject( s, p );
                   break;
  @@ -997,7 +997,7 @@
   
           if( getVerbose() && getFolderName() != null )
           {
  -            log( "Found " + getProjectName() + delim + getViewName() +
  +            getLogger().info( "Found " + getProjectName() + delim + getViewName() +
                    delim + getFolderName() + delim + "\n" );
           }
   
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CovReport.java	2001/12/16 00:34:34	1.3
  +++ CovReport.java	2001/12/16 05:44:57	1.4
  @@ -333,7 +333,7 @@
           }
           if( reference != null && !"xml".equals( format ) )
           {
  -            log( "Ignored reference. It cannot be used in non XML report." );
  +            getLogger().info( "Ignored reference. It cannot be used in non XML report." );
               reference = null;// nullify it so that there is no ambiguity
           }
   
  
  
  
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MSVSSCHECKIN.java	2001/12/16 04:47:49	1.4
  +++ MSVSSCHECKIN.java	2001/12/16 05:44:57	1.5
  @@ -154,7 +154,7 @@
                           "succesful for an unknown reason";
                       throw new TaskException( msg );
                   }
  -                log( "Created dir: " + dir.getAbsolutePath() );
  +                getLogger().info( "Created dir: " + dir.getAbsolutePath() );
               }
   
               cmd.createArgument().setValue( FLAG_OVERRIDE_WORKING_DIR + m_LocalPath );
  
  
  
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MSVSSCHECKOUT.java	2001/12/16 04:47:49	1.4
  +++ MSVSSCHECKOUT.java	2001/12/16 05:44:57	1.5
  @@ -181,7 +181,7 @@
                           "succesful for an unknown reason";
                       throw new TaskException( msg );
                   }
  -                log( "Created dir: " + dir.getAbsolutePath() );
  +                getLogger().info( "Created dir: " + dir.getAbsolutePath() );
               }
   
               cmd.createArgument().setValue( FLAG_OVERRIDE_WORKING_DIR + m_LocalPath );
  
  
  
  1.5       +1 -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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MSVSSGET.java	2001/12/16 04:47:49	1.4
  +++ MSVSSGET.java	2001/12/16 05:44:57	1.5
  @@ -389,7 +389,7 @@
                           "successful for an unknown reason";
                       throw new TaskException( msg );
                   }
  -                log( "Created dir: " + dir.getAbsolutePath() );
  +                getLogger().info( "Created dir: " + dir.getAbsolutePath() );
               }
   
               cmd.createArgument().setValue( FLAG_OVERRIDE_WORKING_DIR + m_LocalPath );
  
  
  

--
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