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 MSVSS.java
Date Wed, 06 Feb 2002 13:38:05 GMT
donaldp     02/02/06 05:38:04

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional
                        ANTLR.java Cab.java Entry.java Javah.java
                        NetRexxC.java Script.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        CCMCreateTask.java Continuus.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase
                        ClearCase.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
                        BorlandDeploymentTool.java
                        BorlandGenerateClient.java DDCreator.java
                        EjbJar.java Ejbc.java GenericDeploymentTool.java
                        WeblogicDeploymentTool.java
                        WebsphereDeploymentTool.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/i18n
                        Translate.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide
                        VAJAntToolGUI.java VAJExport.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/jsp/compilers
                        JasperC.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
                        BatchTest.java JUnitTask.java
                        PlainJUnitResultFormatter.java
                        XMLJUnitResultFormatter.java
                        XMLResultAggregator.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        AbstractMetamataTask.java 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/perforce
                        P4Add.java P4Base.java P4Change.java P4Counter.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
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java
  Log:
  Style touchups
  
  Revision  Changes    Path
  1.22      +2 -2      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ANTLR.java	3 Feb 2002 10:26:21 -0000	1.21
  +++ ANTLR.java	6 Feb 2002 13:37:59 -0000	1.22
  @@ -12,15 +12,15 @@
   import java.io.FileReader;
   import java.io.IOException;
   import java.net.URL;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.ExecuteJava;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.Commandline;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * ANTLR task.
  
  
  
  1.25      +4 -3      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Cab.java	3 Feb 2002 10:26:21 -0000	1.24
  +++ Cab.java	6 Feb 2002 13:37:59 -0000	1.25
  @@ -14,13 +14,13 @@
   import java.io.PrintWriter;
   import java.util.ArrayList;
   import java.util.Iterator;
  -import org.apache.aut.nativelib.Os;
   import org.apache.aut.nativelib.ExecManager;
  +import org.apache.aut.nativelib.Os;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
   
  @@ -198,7 +198,8 @@
           {
               String file = files.get( i ).toString();
               if( new File( m_baseDir, file ).lastModified() >
  -                m_cabFile.lastModified() ) {
  +                m_cabFile.lastModified() )
  +            {
                   upToDate = false;
               }
           }
  
  
  
  1.3       +2 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java
  
  Index: Entry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Entry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Entry.java	20 Jan 2002 17:34:59 -0000	1.2
  +++ Entry.java	6 Feb 2002 13:37:59 -0000	1.3
  @@ -159,7 +159,8 @@
           GregorianCalendar value = new GregorianCalendar();
           GregorianCalendar newValue = new GregorianCalendar();
   
  -        if( m_pattern == null ) {
  +        if( m_pattern == null )
  +        {
               m_pattern = "yyyy/MM/dd HH:mm";
           }
           DateFormat fmt = new SimpleDateFormat( m_pattern );
  
  
  
  1.21      +1 -2      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Javah.java	20 Jan 2002 17:34:59 -0000	1.20
  +++ Javah.java	6 Feb 2002 13:37:59 -0000	1.21
  @@ -12,9 +12,8 @@
   import java.util.Iterator;
   import java.util.StringTokenizer;
   import org.apache.avalon.excalibur.util.StringUtil;
  -
  -import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.AbstractTask;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.FileUtils;
  
  
  
  1.14      +3 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- NetRexxC.java	20 Jan 2002 17:34:59 -0000	1.13
  +++ NetRexxC.java	6 Feb 2002 13:37:59 -0000	1.14
  @@ -20,8 +20,8 @@
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.avalon.excalibur.util.StringUtil;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  +import org.apache.tools.ant.types.DirectoryScanner;
   
   /**
    * Task to compile NetRexx source files. This task can take the following
  @@ -169,7 +169,8 @@
       public void setCompile( boolean compile )
       {
           this.compile = compile;
  -        if( !this.compile && !this.keep ) {
  +        if( !this.compile && !this.keep )
  +        {
               this.keep = true;
           }
       }
  
  
  
  1.14      +6 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
  
  Index: Script.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Script.java	20 Jan 2002 17:34:59 -0000	1.13
  +++ Script.java	6 Feb 2002 13:37:59 -0000	1.14
  @@ -46,7 +46,8 @@
       public void setSrc( String fileName )
       {
           File file = new File( fileName );
  -        if( !file.exists() ) {
  +        if( !file.exists() )
  +        {
               throw new TaskException( "file " + fileName + " not found." );
           }
   
  @@ -140,11 +141,13 @@
               boolean isValid = key.length() > 0 &&
                   Character.isJavaIdentifierStart( key.charAt( 0 ) );
   
  -            for( int i = 1; isValid && i < key.length(); i++ ) {
  +            for( int i = 1; isValid && i < key.length(); i++ )
  +            {
                   isValid = Character.isJavaIdentifierPart( key.charAt( i ) );
               }
   
  -            if( isValid ) {
  +            if( isValid )
  +            {
                   beans.put( key, dictionary.get( key ) );
               }
           }
  
  
  
  1.11      +1 -1      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CCMCreateTask.java	20 Jan 2002 02:11:43 -0000	1.10
  +++ CCMCreateTask.java	6 Feb 2002 13:37:59 -0000	1.11
  @@ -7,8 +7,8 @@
    */
   package org.apache.tools.ant.taskdefs.optional.ccm;
   
  -import org.apache.myrmidon.api.TaskException;
   import org.apache.aut.nativelib.ExecOutputHandler;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  
  
  
  1.19      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java
  
  Index: Continuus.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Continuus.java	3 Feb 2002 10:26:21 -0000	1.18
  +++ Continuus.java	6 Feb 2002 13:37:59 -0000	1.19
  @@ -9,10 +9,10 @@
   
   import java.io.File;
   import java.io.IOException;
  +import org.apache.aut.nativelib.ExecManager;
  +import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.aut.nativelib.ExecOutputHandler;
  -import org.apache.aut.nativelib.ExecManager;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
   
  
  
  
  1.16      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java
  
  Index: ClearCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ClearCase.java	3 Feb 2002 10:26:21 -0000	1.15
  +++ ClearCase.java	6 Feb 2002 13:37:59 -0000	1.16
  @@ -9,11 +9,11 @@
   
   import java.io.File;
   import java.io.IOException;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * A base class for creating tasks for executing commands on ClearCase. <p>
  
  
  
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Depend.java	20 Jan 2002 09:58:34 -0000	1.15
  +++ Depend.java	6 Feb 2002 13:37:59 -0000	1.16
  @@ -21,8 +21,8 @@
   import java.util.Hashtable;
   import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.PathUtil;
   
  
  
  
  1.14      +61 -27    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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CSharp.java	20 Jan 2002 17:35:01 -0000	1.13
  +++ CSharp.java	6 Feb 2002 13:37:59 -0000	1.14
  @@ -9,9 +9,9 @@
   
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.taskdefs.MatchingTask;
   
   // ====================================================================
   
  @@ -420,7 +420,8 @@
           throws TaskException
       {
           //demand create pathlist
  -        if( _referenceFiles == null ) {
  +        if( _referenceFiles == null )
  +        {
               _referenceFiles = new Path();
           }
           _referenceFiles.append( path );
  @@ -462,7 +463,8 @@
           {
               _targetType = targetType;
           }
  -        else {
  +        else
  +        {
               throw new TaskException( "targetType " + targetType + " is not a valid type" );
           }
       }
  @@ -650,8 +652,9 @@
       public void execute()
           throws TaskException
       {
  -        if( _srcDir == null ) {
  -          _srcDir = getBaseDirectory();
  +        if( _srcDir == null )
  +        {
  +            _srcDir = getBaseDirectory();
           }
   
           NetCommand command = new NetCommand( this, "CSC", csc_exe_name );
  @@ -710,9 +713,12 @@
        */
       protected String getAdditionalModulesParameter()
       {
  -        if( notEmpty( _additionalModules ) ) {
  +        if( notEmpty( _additionalModules ) )
  +        {
               return "/addmodule:" + _additionalModules;
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -740,7 +746,8 @@
               s.append( DEFAULT_REFERENCE_LIST );
               return new String( s );
           }
  -        else {
  +        else
  +        {
               return null;
           }
       }
  @@ -752,9 +759,12 @@
        */
       protected String getDefinitionsParameter()
       {
  -        if( notEmpty( _definitions ) ) {
  +        if( notEmpty( _definitions ) )
  +        {
               return "/define:" + _definitions;
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -766,9 +776,12 @@
        */
       protected String getDocFileParameter()
       {
  -        if( _docFile != null ) {
  +        if( _docFile != null )
  +        {
               return "/doc:" + _docFile.toString();
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -780,9 +793,12 @@
        */
       protected String getExtraOptionsParameter()
       {
  -        if( _extraOptions != null && _extraOptions.length() != 0 ) {
  +        if( _extraOptions != null && _extraOptions.length() != 0 )
  +        {
               return _extraOptions;
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -819,9 +835,12 @@
        */
       protected String getMainClassParameter()
       {
  -        if( _mainClass != null && _mainClass.length() != 0 ) {
  +        if( _mainClass != null && _mainClass.length() != 0 )
  +        {
               return "/main:" + _mainClass;
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -853,7 +872,8 @@
               File f = _outputFile;
               return "/out:" + f.toString();
           }
  -        else {
  +        else
  +        {
               return null;
           }
       }
  @@ -866,7 +886,8 @@
       protected String getReferenceFilesParameter()
       {
           //bail on no references
  -        if( _references == null ) {
  +        if( _references == null )
  +        {
               return null;
           }
           //iterate through the ref list & generate an entry for each
  @@ -875,7 +896,8 @@
           String refpath = _references.toString();
   
           //bail on no references listed
  -        if( refpath.length() == 0 ) {
  +        if( refpath.length() == 0 )
  +        {
               return null;
           }
   
  @@ -892,9 +914,12 @@
       protected String getReferencesParameter()
       {
           //bail on no references
  -        if( notEmpty( _references ) ) {
  +        if( notEmpty( _references ) )
  +        {
               return "/reference:" + _references;
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -906,9 +931,12 @@
        */
       protected String getTargetTypeParameter()
       {
  -        if( notEmpty( _targetType ) ) {
  +        if( notEmpty( _targetType ) )
  +        {
               return "/target:" + _targetType;
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -945,9 +973,12 @@
        */
       protected String getWin32IconParameter()
       {
  -        if( _win32icon != null ) {
  +        if( _win32icon != null )
  +        {
               return "/win32icon:" + _win32icon.toString();
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -959,9 +990,12 @@
        */
       protected String getWin32ResParameter()
       {
  -        if( _win32res != null ) {
  +        if( _win32res != null )
  +        {
               return "/win32res:" + _win32res.toString();
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  
  
  
  1.11      +28 -13    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Ilasm.java	20 Jan 2002 17:35:01 -0000	1.10
  +++ Ilasm.java	6 Feb 2002 13:37:59 -0000	1.11
  @@ -226,7 +226,8 @@
           {
               _targetType = targetType;
           }
  -        else {
  +        else
  +        {
               throw new TaskException( "targetType " + targetType + " is not a valid type" );
           }
       }
  @@ -306,8 +307,9 @@
       public void execute()
           throws TaskException
       {
  -        if( _srcDir == null ) {
  -          _srcDir = getBaseDirectory();
  +        if( _srcDir == null )
  +        {
  +            _srcDir = getBaseDirectory();
           }
   
           //get dependencies list.
  @@ -375,9 +377,12 @@
        */
       protected String getExtraOptionsParameter()
       {
  -        if( _extraOptions != null && _extraOptions.length() != 0 ) {
  +        if( _extraOptions != null && _extraOptions.length() != 0 )
  +        {
               return _extraOptions;
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -389,9 +394,12 @@
        */
       protected String getKeyfileParameter()
       {
  -        if( _keyfile != null ) {
  +        if( _keyfile != null )
  +        {
               return "/keyfile:" + _keyfile.toString();
  -        } else {
  +        }
  +        else
  +        {
               return null;
           }
       }
  @@ -413,7 +421,8 @@
        */
       protected String getOutputFileParameter()
       {
  -        if( _outputFile == null || _outputFile.length() == 0 ) {
  +        if( _outputFile == null || _outputFile.length() == 0 )
  +        {
               return null;
           }
           File f = _outputFile;
  @@ -440,16 +449,22 @@
   
       protected String getTargetTypeParameter()
       {
  -        if( !notEmpty( _targetType ) ) {
  +        if( !notEmpty( _targetType ) )
  +        {
               return null;
           }
  -        if( _targetType.equals( "exe" ) ) {
  +        if( _targetType.equals( "exe" ) )
  +        {
               return "/exe";
  -        } else if( _targetType.equals( "library" ) ) {
  +        }
  +        else if( _targetType.equals( "library" ) )
  +        {
               return "/dll";
  -               } else {
  +        }
  +        else
  +        {
               return null;
  -               }
  +        }
       }
   
       /**
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- NetCommand.java	3 Feb 2002 10:26:20 -0000	1.18
  +++ NetCommand.java	6 Feb 2002 13:37:59 -0000	1.19
  @@ -9,12 +9,12 @@
   
   import java.io.File;
   import java.io.IOException;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * This is a helper class to spawn net commands out. In its initial form it
  
  
  
  1.19      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java
  
  Index: BorlandDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- BorlandDeploymentTool.java	3 Feb 2002 10:26:22 -0000	1.18
  +++ BorlandDeploymentTool.java	6 Feb 2002 13:38:00 -0000	1.19
  @@ -16,6 +16,7 @@
   import java.util.ArrayList;
   import java.util.Hashtable;
   import java.util.Iterator;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
  @@ -24,7 +25,6 @@
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.util.FileUtils;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * BorlandDeploymentTool is dedicated to the Borland Application Server 4.5 and
  
  
  
  1.21      +2 -2      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- BorlandGenerateClient.java	3 Feb 2002 10:26:21 -0000	1.20
  +++ BorlandGenerateClient.java	6 Feb 2002 13:38:00 -0000	1.21
  @@ -8,13 +8,13 @@
   package org.apache.tools.ant.taskdefs.optional.ejb;
   
   import java.io.File;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.Argument;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * BorlandGenerateClient is dedicated to the Borland Application Server 4.5 This
  
  
  
  1.10      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java
  
  Index: DDCreator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DDCreator.java	13 Jan 2002 00:04:03 -0000	1.9
  +++ DDCreator.java	6 Feb 2002 13:38:00 -0000	1.10
  @@ -9,10 +9,10 @@
   
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.Path;
   
   /**
  
  
  
  1.9       +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java
  
  Index: EjbJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EjbJar.java	15 Jan 2002 09:51:08 -0000	1.8
  +++ EjbJar.java	6 Feb 2002 13:38:00 -0000	1.9
  @@ -15,8 +15,8 @@
   import javax.xml.parsers.SAXParser;
   import javax.xml.parsers.SAXParserFactory;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.Path;
  
  
  
  1.11      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java
  
  Index: Ejbc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Ejbc.java	13 Jan 2002 00:04:03 -0000	1.10
  +++ Ejbc.java	6 Feb 2002 13:38:00 -0000	1.11
  @@ -9,10 +9,10 @@
   
   import java.io.File;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.taskdefs.MatchingTask;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.Path;
   
   /**
  
  
  
  1.18      +5 -5      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
  
  Index: GenericDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- GenericDeploymentTool.java	26 Jan 2002 02:08:10 -0000	1.17
  +++ GenericDeploymentTool.java	6 Feb 2002 13:38:00 -0000	1.18
  @@ -12,8 +12,8 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.net.URLClassLoader;
   import java.net.URL;
  +import java.net.URLClassLoader;
   import java.util.ArrayList;
   import java.util.HashSet;
   import java.util.Hashtable;
  @@ -26,13 +26,12 @@
   import java.util.zip.ZipEntry;
   import javax.xml.parsers.SAXParser;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -
  -import org.apache.bcel.classfile.JavaClass;
   import org.apache.bcel.classfile.ClassParser;
  +import org.apache.bcel.classfile.JavaClass;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.PathUtil;
  @@ -608,7 +607,8 @@
           while( i.hasNext() )
           {
               String entryName = (String)i.next();
  -            if( entryName.endsWith( ".class" ) ) {
  +            if( entryName.endsWith( ".class" ) )
  +            {
                   newSet.add( entryName.substring( 0, entryName.length() - ".class".length() ).replace( File.separatorChar, '/' ) );
               }
           }
  
  
  
  1.16      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java
  
  Index: WeblogicDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- WeblogicDeploymentTool.java	20 Jan 2002 09:58:35 -0000	1.15
  +++ WeblogicDeploymentTool.java	6 Feb 2002 13:38:00 -0000	1.16
  @@ -12,8 +12,8 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.net.URLClassLoader;
   import java.net.URL;
  +import java.net.URLClassLoader;
   import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.jar.JarEntry;
  
  
  
  1.17      +3 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java
  
  Index: WebsphereDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- WebsphereDeploymentTool.java	20 Jan 2002 17:35:00 -0000	1.16
  +++ WebsphereDeploymentTool.java	6 Feb 2002 13:38:00 -0000	1.17
  @@ -11,8 +11,8 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.net.URLClassLoader;
   import java.net.URL;
  +import java.net.URLClassLoader;
   import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.jar.JarEntry;
  @@ -943,7 +943,8 @@
                       " " + tempdir +
                       " " + destJar.getPath() +
                       " " + getOptions();
  -                if( getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0 ) {
  +                if( getCombinedClasspath() != null && getCombinedClasspath().toString().length() > 0 )
  +                {
                       args += " -cp " + getCombinedClasspath();
                   }
   
  
  
  
  1.14      +1 -1      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Translate.java	26 Jan 2002 02:08:11 -0000	1.13
  +++ Translate.java	6 Feb 2002 13:38:00 -0000	1.14
  @@ -20,8 +20,8 @@
   import java.util.Locale;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
   
  
  
  
  1.10      +30 -16    jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java
  
  Index: VAJAntToolGUI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- VAJAntToolGUI.java	20 Jan 2002 17:35:02 -0000	1.9
  +++ VAJAntToolGUI.java	6 Feb 2002 13:38:00 -0000	1.10
  @@ -44,7 +44,6 @@
   import org.apache.tools.ant.BuildListener;
   import org.apache.tools.ant.Project;
   
  -
   /**
    * This is a simple grafical user interface to provide the information needed by
    * ANT and to start the build-process within IBM VisualAge for Java. <p>
  @@ -1544,31 +1543,38 @@
                       }
                   }
                   // MenuItems
  -                if( e.getSource() == VAJAntToolGUI.this.getSaveMenuItem() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getSaveMenuItem() )
  +                {
                       saveBuildInfo();
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getAboutMenuItem() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getAboutMenuItem() )
  +                {
                       getAboutDialog().show();
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getShowLogMenuItem() )
  +                {
                       getMessageFrame().show();
                   }
                   /*
                    * #### About dialog ####
                    */
  -                if( e.getSource() == VAJAntToolGUI.this.getAboutOkButton() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getAboutOkButton() )
  +                {
                       getAboutDialog().dispose();
                   }
                   /*
                    * #### Log frame ####
                    */
  -                if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() )
  +                {
                       getMessageFrame().dispose();
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getMessageClearLogButton() )
  +                {
                       getMessageTextArea().setText( "" );
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getMessageOkButton() )
  +                {
                       getMessageFrame().dispose();
                   }
               }
  @@ -1587,13 +1593,16 @@
           {
               try
               {
  -                if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getTargetList() )
  +                {
                       getBuildButton().setEnabled( true );
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getMessageOutputLevelChoice() )
  +                {
                       getBuildInfo().setOutputMessageLevel( getMessageOutputLevelChoice().getSelectedIndex() );
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getTargetList() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getTargetList() )
  +                {
                       getBuildInfo().setTarget( getTargetList().getSelectedItem() );
                   }
               }
  @@ -1610,10 +1619,12 @@
            */
           public void propertyChange( java.beans.PropertyChangeEvent evt )
           {
  -            if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "projectName" ) ) ) {
  +            if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "projectName" ) ) )
  +            {
                   connectProjectNameToLabel();
               }
  -            if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "buildFileName" ) ) ) {
  +            if( evt.getSource() == VAJAntToolGUI.this.getBuildInfo() && ( evt.getPropertyName().equals( "buildFileName" ) ) )
  +            {
                   connectBuildFileNameToTextField();
               }
           }
  @@ -1625,7 +1636,8 @@
            */
           public void textValueChanged( TextEvent e )
           {
  -            if( e.getSource() == VAJAntToolGUI.this.getBuildFileTextField() ) {
  +            if( e.getSource() == VAJAntToolGUI.this.getBuildFileTextField() )
  +            {
                   connectTextFieldToBuildFileName();
               }
           }
  @@ -1652,10 +1664,12 @@
                       dispose();
                       System.exit( 0 );
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getAboutDialog() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getAboutDialog() )
  +                {
                       getAboutDialog().dispose();
                   }
  -                if( e.getSource() == VAJAntToolGUI.this.getMessageFrame() ) {
  +                if( e.getSource() == VAJAntToolGUI.this.getMessageFrame() )
  +                {
                       getMessageFrame().dispose();
                   }
               }
  
  
  
  1.10      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java
  
  Index: VAJExport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJExport.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- VAJExport.java	26 Jan 2002 02:08:11 -0000	1.9
  +++ VAJExport.java	6 Feb 2002 13:38:00 -0000	1.10
  @@ -8,8 +8,8 @@
   package org.apache.tools.ant.taskdefs.optional.ide;
   
   import java.io.File;
  -import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.TaskContext;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Pattern;
   import org.apache.myrmidon.framework.PatternSet;
   import org.apache.myrmidon.framework.PatternUtil;
  
  
  
  1.24      +2 -3      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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- JJTree.java	3 Feb 2002 10:26:21 -0000	1.23
  +++ JJTree.java	6 Feb 2002 13:38:01 -0000	1.24
  @@ -11,15 +11,14 @@
   import java.io.IOException;
   import java.util.Enumeration;
   import java.util.Hashtable;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
  -
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.PathUtil;
  -import org.apache.tools.ant.types.Commandline;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Taskdef for the JJTree compiler compiler.
  
  
  
  1.19      +2 -5      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JavaCC.java	3 Feb 2002 10:26:21 -0000	1.18
  +++ JavaCC.java	6 Feb 2002 13:38:01 -0000	1.19
  @@ -11,17 +11,14 @@
   import java.io.IOException;
   import java.util.Enumeration;
   import java.util.Hashtable;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
  -
  -
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.PathUtil;
  -import org.apache.tools.ant.types.Commandline;
  -import org.apache.avalon.excalibur.util.StringUtil;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Taskdef for the JavaCC compiler compiler.
  
  
  
  1.23      +4 -4      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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- JDependTask.java	3 Feb 2002 10:26:21 -0000	1.22
  +++ JDependTask.java	6 Feb 2002 13:38:01 -0000	1.23
  @@ -11,15 +11,14 @@
   import java.io.FileWriter;
   import java.io.IOException;
   import java.io.PrintWriter;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
  -
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.util.FileUtils;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Ant task to run JDepend tests. <p>
  @@ -234,7 +233,8 @@
               File f = new File( elements[ i ] );
   
               // not necessary as JDepend would fail, but why loose some time?
  -            if( !f.exists() || !f.isDirectory() ) {
  +            if( !f.exists() || !f.isDirectory() )
  +            {
                   throw new TaskException( "\"" + f.getPath() + "\" does not represent a valid directory. JDepend would fail." );
               }
               commandline.addArgument( f.getPath() );
  
  
  
  1.17      +13 -7     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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JspC.java	20 Jan 2002 17:35:02 -0000	1.16
  +++ JspC.java	6 Feb 2002 13:38:01 -0000	1.17
  @@ -11,10 +11,10 @@
   import java.util.ArrayList;
   import java.util.Date;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   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;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.Path;
   
   /**
  @@ -56,7 +56,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.16 $ $Date: 2002/01/20 17:35:02 $
  + * @version $Revision: 1.17 $ $Date: 2002/02/06 13:38:01 $
    */
   public class JspC extends MatchingTask
   {
  @@ -101,9 +101,12 @@
       public void setClasspath( Path cp )
           throws TaskException
       {
  -        if( classpath == null ) {
  +        if( classpath == null )
  +        {
               classpath = cp;
  -        } else {
  +        }
  +        else
  +        {
               classpath.append( cp );
           }
       }
  @@ -299,7 +302,8 @@
       public Path createClasspath()
           throws TaskException
       {
  -        if( classpath == null ) {
  +        if( classpath == null )
  +        {
               classpath = new Path();
           }
           Path path1 = classpath;
  @@ -334,9 +338,11 @@
   
           // calculate where the files will end up:
           File dest = null;
  -        if( packageName == null ) {
  +        if( packageName == null )
  +        {
               dest = destDir;
  -        } else
  +        }
  +        else
           {
               String path = destDir.getPath() + File.separatorChar +
                   packageName.replace( '.', File.separatorChar );
  
  
  
  1.19      +2 -2      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- WLJspc.java	20 Jan 2002 02:36:21 -0000	1.18
  +++ WLJspc.java	6 Feb 2002 13:38:01 -0000	1.19
  @@ -12,11 +12,11 @@
   import java.util.Date;
   import java.util.StringTokenizer;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  -import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.DirectoryScanner;
  +import org.apache.tools.ant.types.Path;
   
   /**
    * Class to precompile JSP's using weblogic's jsp compiler (weblogic.jspc)
  
  
  
  1.12      +5 -3      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java
  
  Index: JasperC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- JasperC.java	20 Jan 2002 17:35:02 -0000	1.11
  +++ JasperC.java	6 Feb 2002 13:38:01 -0000	1.12
  @@ -10,8 +10,8 @@
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.taskdefs.Java;
   import org.apache.tools.ant.taskdefs.optional.jsp.JspC;
  -import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.Commandline;
   
   /**
    * The implementation of the jasper compiler. This is a cut-and-paste of the
  @@ -37,12 +37,14 @@
               // the project log
               //FIXME
               Java java = null;//(Java)( getJspc().getProject() ).createTask( "java" );
  -            if( getJspc().getClasspath() != null ) {
  +            if( getJspc().getClasspath() != null )
  +            {
                   java.addClasspath( getJspc().getClasspath() );
               }
               java.setClassname( "org.apache.jasper.JspC" );
               String args[] = cmd.getArguments();
  -            for( int i = 0; i < args.length; i++ ) {
  +            for( int i = 0; i < args.length; i++ )
  +            {
                   java.addArg( new Argument( args[ i ] ) );
               }
               java.execute();
  
  
  
  1.11      +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java
  
  Index: BatchTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- BatchTest.java	26 Jan 2002 02:08:11 -0000	1.10
  +++ BatchTest.java	6 Feb 2002 13:38:01 -0000	1.11
  @@ -13,7 +13,6 @@
   import java.util.Iterator;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.types.DirectoryScanner;
  -
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
   
  
  
  
  1.34      +5 -5      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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- JUnitTask.java	3 Feb 2002 10:26:21 -0000	1.33
  +++ JUnitTask.java	6 Feb 2002 13:38:01 -0000	1.34
  @@ -19,20 +19,19 @@
   import java.util.Iterator;
   import java.util.Properties;
   import java.util.Random;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.api.AbstractTask;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.EnvironmentVariable;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.SysProperties;
   import org.apache.tools.ant.types.PathUtil;
  -import org.apache.tools.ant.types.Commandline;
  -import org.apache.aut.nativelib.ExecManager;
  +import org.apache.tools.ant.types.SysProperties;
   
   /**
    * Ant task to run JUnit tests. <p>
  @@ -671,7 +670,8 @@
           }
           finally
           {
  -            if( !propsFile.delete() ) {
  +            if( !propsFile.delete() )
  +            {
                   throw new TaskException( "Could not delete temporary properties file." );
               }
           }
  
  
  
  1.6       +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java
  
  Index: PlainJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PlainJUnitResultFormatter.java	20 Jan 2002 17:35:00 -0000	1.5
  +++ PlainJUnitResultFormatter.java	6 Feb 2002 13:38:01 -0000	1.6
  @@ -15,7 +15,6 @@
   import java.util.Hashtable;
   import junit.framework.AssertionFailedError;
   import junit.framework.Test;
  -
   import org.apache.avalon.excalibur.util.StringUtil;
   import org.apache.myrmidon.api.TaskException;
   
  
  
  
  1.10      +0 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java
  
  Index: XMLJUnitResultFormatter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XMLJUnitResultFormatter.java	20 Jan 2002 17:35:00 -0000	1.9
  +++ XMLJUnitResultFormatter.java	6 Feb 2002 13:38:01 -0000	1.10
  @@ -18,7 +18,6 @@
   import javax.xml.parsers.DocumentBuilderFactory;
   import junit.framework.AssertionFailedError;
   import junit.framework.Test;
  -
   import org.apache.myrmidon.api.TaskException;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
  
  
  
  1.17      +1 -1      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XMLResultAggregator.java	26 Jan 2002 02:08:11 -0000	1.16
  +++ XMLResultAggregator.java	6 Feb 2002 13:38:01 -0000	1.17
  @@ -19,8 +19,8 @@
   import javax.xml.parsers.DocumentBuilderFactory;
   import org.apache.avalon.framework.ExceptionUtil;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
   import org.w3c.dom.Document;
  
  
  
  1.25      +3 -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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- AbstractMetamataTask.java	3 Feb 2002 10:26:21 -0000	1.24
  +++ AbstractMetamataTask.java	6 Feb 2002 13:38:02 -0000	1.25
  @@ -15,17 +15,17 @@
   import java.util.Hashtable;
   import java.util.Iterator;
   import java.util.Random;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.ScannerUtil;
  -import org.apache.tools.ant.types.Commandline;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Somewhat abstract framework to be used for other metama 2.0 tasks. This
  
  
  
  1.23      +3 -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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- MParse.java	3 Feb 2002 10:26:21 -0000	1.22
  +++ MParse.java	6 Feb 2002 13:38:02 -0000	1.23
  @@ -13,15 +13,15 @@
   import java.io.PrintWriter;
   import java.util.ArrayList;
   import java.util.Random;
  +import org.apache.aut.nativelib.ExecManager;
  +import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Argument;
  +import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  -import org.apache.tools.ant.types.Commandline;
  -import org.apache.avalon.excalibur.io.IOUtil;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Simple Metamata MParse task based on the original written by <a
  
  
  
  1.15      +3 -3      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- FTP.java	26 Jan 2002 02:08:11 -0000	1.14
  +++ FTP.java	6 Feb 2002 13:38:02 -0000	1.15
  @@ -22,13 +22,12 @@
   import java.io.OutputStream;
   import java.util.ArrayList;
   import org.apache.avalon.excalibur.io.FileUtil;
  -import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.TaskContext;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.types.FileScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  -import org.apache.tools.ant.types.DirectoryScanner;
   
   /**
    * Basic FTP client that performs the following actions:
  @@ -706,7 +705,8 @@
           {
               File file = resolveFile( new File( dir, filename ).getPath() );
   
  -            if( m_newerOnly && isUpToDate( ftp, file, remoteResolveFile( filename ) ) ) {
  +            if( m_newerOnly && isUpToDate( ftp, file, remoteResolveFile( filename ) ) )
  +            {
                   return;
               }
   
  
  
  
  1.15      +5 -3      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MimeMail.java	26 Jan 2002 02:08:11 -0000	1.14
  +++ MimeMail.java	6 Feb 2002 13:38:02 -0000	1.15
  @@ -24,8 +24,8 @@
   import javax.mail.internet.MimeMessage;
   import javax.mail.internet.MimeMultipart;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.Task;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
   
  @@ -114,7 +114,8 @@
                                          )
           throws MessagingException, TaskException
       {
  -        if( ( null == addrList ) || ( addrList.trim().length() <= 0 ) ) {
  +        if( ( null == addrList ) || ( addrList.trim().length() <= 0 ) )
  +        {
               return;
           }
   
  @@ -122,7 +123,8 @@
           {
               InternetAddress[] addrArray = InternetAddress.parse( addrList );
   
  -            if( ( null == addrArray ) || ( 0 == addrArray.length ) ) {
  +            if( ( null == addrArray ) || ( 0 == addrArray.length ) )
  +            {
                   throw new TaskException( "Empty " + addrUserName + " recipients list was specified" );
               }
   
  
  
  
  1.12      +4 -2      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- P4Add.java	26 Jan 2002 02:08:11 -0000	1.11
  +++ P4Add.java	6 Feb 2002 13:38:02 -0000	1.12
  @@ -89,7 +89,8 @@
       public void setChangelist( int changelist )
           throws TaskException
       {
  -        if( changelist <= 0 ) {
  +        if( changelist <= 0 )
  +        {
               throw new TaskException( "P4Add: Changelist# should be a positive number" );
           }
   
  @@ -99,7 +100,8 @@
       public void setCommandlength( int len )
           throws TaskException
       {
  -        if( len <= 0 ) {
  +        if( len <= 0 )
  +        {
               throw new TaskException( "P4Add: Commandlength should be a positive number" );
           }
           this.m_cmdLength = len;
  
  
  
  1.18      +2 -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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- P4Base.java	3 Feb 2002 10:26:20 -0000	1.17
  +++ P4Base.java	6 Feb 2002 13:38:02 -0000	1.18
  @@ -8,9 +8,9 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import java.io.IOException;
  -import org.apache.myrmidon.api.TaskException;
  -import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.aut.nativelib.ExecManager;
  +import org.apache.aut.nativelib.ExecOutputHandler;
  +import org.apache.myrmidon.api.TaskException;
   import org.apache.oro.text.perl.Perl5Util;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  
  
  
  1.9       +0 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- P4Change.java	3 Feb 2002 03:46:54 -0000	1.8
  +++ P4Change.java	6 Feb 2002 13:38:02 -0000	1.9
  @@ -8,7 +8,6 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.api.AbstractTask;
   
   /**
    * P4Change - grab a new changelist from Perforce. P4Change creates a new
  
  
  
  1.9       +0 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- P4Counter.java	3 Feb 2002 03:46:54 -0000	1.8
  +++ P4Counter.java	6 Feb 2002 13:38:03 -0000	1.9
  @@ -8,7 +8,6 @@
   package org.apache.tools.ant.taskdefs.optional.perforce;
   
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.api.AbstractTask;
   
   /**
    * P4Counter - Obtain or set the value of a counter. P4Counter can be used to
  
  
  
  1.7       +1 -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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- P4Sync.java	12 Jan 2002 04:57:36 -0000	1.6
  +++ P4Sync.java	6 Feb 2002 13:38:03 -0000	1.7
  @@ -91,7 +91,7 @@
       public void setForce( final boolean force )
           throws TaskException
       {
  -        if( force  )
  +        if( force )
           {
               m_p4CmdOpts = "-f";
           }
  
  
  
  1.19      +1 -1      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Pvcs.java	3 Feb 2002 10:26:20 -0000	1.18
  +++ Pvcs.java	6 Feb 2002 13:38:04 -0000	1.19
  @@ -19,8 +19,8 @@
   import java.text.ParseException;
   import java.util.ArrayList;
   import java.util.Iterator;
  -import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.aut.nativelib.ExecManager;
  +import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  
  
  
  1.8       +0 -1      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AntStarTeamCheckOut.java	24 Jan 2002 11:38:05 -0000	1.7
  +++ AntStarTeamCheckOut.java	6 Feb 2002 13:38:04 -0000	1.8
  @@ -17,7 +17,6 @@
   import com.starbase.util.Platform;
   import java.util.StringTokenizer;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.ScannerUtil;
   
   /**
  
  
  
  1.19      +2 -2      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CovMerge.java	3 Feb 2002 10:26:21 -0000	1.18
  +++ CovMerge.java	6 Feb 2002 13:38:04 -0000	1.19
  @@ -13,14 +13,14 @@
   import java.io.PrintWriter;
   import java.util.ArrayList;
   import java.util.Random;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  +import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.ScannerUtil;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Convenient task to run the snapshot merge utility for JProbe Coverage.
  
  
  
  1.20      +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- CovReport.java	3 Feb 2002 10:26:21 -0000	1.19
  +++ CovReport.java	6 Feb 2002 13:38:04 -0000	1.20
  @@ -17,13 +17,13 @@
   import javax.xml.transform.TransformerFactory;
   import javax.xml.transform.dom.DOMSource;
   import javax.xml.transform.stream.StreamResult;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Path;
  -import org.apache.aut.nativelib.ExecManager;
   import org.w3c.dom.Document;
   
   /**
  
  
  
  1.20      +1 -1      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Coverage.java	3 Feb 2002 10:26:21 -0000	1.19
  +++ Coverage.java	6 Feb 2002 13:38:04 -0000	1.20
  @@ -13,6 +13,7 @@
   import java.io.PrintWriter;
   import java.io.StringWriter;
   import java.util.ArrayList;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
  @@ -21,7 +22,6 @@
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.FileSet;
   import org.apache.tools.ant.types.Path;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Convenient task to run Sitraka JProbe Coverage from Ant. Options are pretty
  
  
  
  1.20      +1 -1      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
  
  Index: MSVSS.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- MSVSS.java	3 Feb 2002 10:26:20 -0000	1.19
  +++ MSVSS.java	6 Feb 2002 13:38:04 -0000	1.20
  @@ -10,11 +10,11 @@
   import java.io.File;
   import java.io.IOException;
   import java.util.Properties;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  -import org.apache.aut.nativelib.ExecManager;
   
   /**
    * A base class for creating tasks for executing commands on Visual SourceSafe.
  
  
  

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