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/ejb BorlandGenerateClient.java BorlandDeploymentTool.java
Date Sun, 10 Feb 2002 00:46:52 GMT
donaldp     02/02/09 16:46:52

  Modified:    proposal/myrmidon/src/java/org/apache/antlib/security
                        SignJar.java GenerateKey.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix
                        Rpm.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/pvcs
                        Pvcs.java
               proposal/myrmidon/src/java/org/apache/antlib/build
                        Patch.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/perforce
                        P4Base.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/dotnet
                        NetCommand.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/metamata
                        MParse.java AbstractMetamataTask.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit
                        JUnitTask.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/javadoc
                        Javadoc.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Java.java
               proposal/myrmidon/src/java/org/apache/antlib/nativelib
                        Exec.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java
               proposal/myrmidon/src/java/org/apache/antlib/cvslib Cvs.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sitraka
                        CovReport.java CovMerge.java Coverage.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ccm
                        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
                        Cab.java ANTLR.java
               proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        BorlandGenerateClient.java
                        BorlandDeploymentTool.java
  Added:       proposal/myrmidon/src/java/org/apache/myrmidon/framework
                        Execute.java
  Removed:     proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/exec
                        Execute2.java
  Log:
  Renamed Execute2 to Execute and moved it into the myrmidon.framework package.
  
  Cleaned up its code a little. ALso reworked it so that the user can specify an expectedReturnCode
and if the value is not the one expected a TaskException is thrown.
  
  Revision  Changes    Path
  1.9       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SignJar.java	10 Feb 2002 00:25:42 -0000	1.8
  +++ SignJar.java	10 Feb 2002 00:46:50 -0000	1.9
  @@ -16,7 +16,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -296,7 +296,7 @@
   
           final Commandline cmd = buildCommand( jarTarget, jarSource );
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           exe.setCommandline( cmd );
           try
           {
  
  
  
  1.6       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- GenerateKey.java	6 Feb 2002 13:33:07 -0000	1.5
  +++ GenerateKey.java	10 Feb 2002 00:46:50 -0000	1.6
  @@ -11,7 +11,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -122,7 +122,7 @@
   
           final Commandline cmd = createCommand();
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           exe.setWorkingDirectory( getBaseDirectory() );
           exe.setCommandline( cmd );
           try
  
  
  
  1.14      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java
  
  Index: Rpm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/unix/Rpm.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Rpm.java	10 Feb 2002 00:25:30 -0000	1.13
  +++ Rpm.java	10 Feb 2002 00:46:50 -0000	1.14
  @@ -12,7 +12,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -91,7 +91,7 @@
       {
           final Commandline cmd = createCommand();
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
   
           if( m_topDir == null )
           {
  
  
  
  1.21      +3 -3      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Pvcs.java	10 Feb 2002 00:25:30 -0000	1.20
  +++ Pvcs.java	10 Feb 2002 00:46:50 -0000	1.21
  @@ -24,7 +24,7 @@
   import org.apache.avalon.excalibur.io.IOUtil;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -192,7 +192,7 @@
           try
           {
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               exe.setWorkingDirectory( getBaseDirectory() );
               exe.setCommandline( cmd );
               result = exe.execute();
  @@ -273,7 +273,7 @@
               final File fileList = File.createTempFile( "pvcs_ant_", ".log" );
   
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               exe.setExecOutputHandler( this );
               m_output = new FileOutputStream( tmp );
               exe.setWorkingDirectory( getBaseDirectory() );
  
  
  
  1.4       +2 -2      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java
  
  Index: Patch.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/build/Patch.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Patch.java	10 Feb 2002 00:26:40 -0000	1.3
  +++ Patch.java	10 Feb 2002 00:46:50 -0000	1.4
  @@ -12,7 +12,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -101,7 +101,7 @@
           validate();
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
   
           buildCommand( exe.getCommandline() );
   
  
  
  
  1.19      +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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- P4Base.java	6 Feb 2002 13:38:02 -0000	1.18
  +++ P4Base.java	10 Feb 2002 00:46:50 -0000	1.19
  @@ -12,7 +12,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -167,7 +167,7 @@
               }
   
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               exe.setExecOutputHandler( handler );
               exe.setCommandline( cmd );
   
  
  
  
  1.21      +3 -3      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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- NetCommand.java	10 Feb 2002 00:25:30 -0000	1.20
  +++ NetCommand.java	10 Feb 2002 00:46:50 -0000	1.21
  @@ -13,7 +13,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -44,7 +44,7 @@
       /**
        * executabe
        */
  -    protected Execute2 _exe;
  +    protected Execute _exe;
   
       /**
        * flag to control action on execution trouble
  @@ -201,7 +201,7 @@
           // default directory to the project's base directory
           File dir = _owner.getBaseDirectory();
           final ExecManager execManager = (ExecManager)_owner.getService( ExecManager.class
);
  -        _exe = new Execute2( execManager );
  +        _exe = new Execute( execManager );
           _exe.setWorkingDirectory( dir );
       }
   }
  
  
  
  1.22      +2 -2      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- MSVSS.java	10 Feb 2002 00:25:30 -0000	1.21
  +++ MSVSS.java	10 Feb 2002 00:46:50 -0000	1.22
  @@ -13,7 +13,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -206,7 +206,7 @@
           try
           {
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
   
               // If location of ss.ini is specified we need to set the
               // environment-variable SSDIR to this value
  
  
  
  1.25      +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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- MParse.java	10 Feb 2002 00:25:31 -0000	1.24
  +++ MParse.java	10 Feb 2002 00:46:50 -0000	1.25
  @@ -17,7 +17,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -288,7 +288,7 @@
           }
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           getLogger().debug( m_cmdl.toString() );
           final String[] commandline = m_cmdl.getCommandline();
           exe.setCommandline( new Commandline( commandline ) );
  
  
  
  1.27      +2 -2      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- AbstractMetamataTask.java	10 Feb 2002 00:25:31 -0000	1.26
  +++ AbstractMetamataTask.java	10 Feb 2002 00:46:50 -0000	1.27
  @@ -18,7 +18,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -280,7 +280,7 @@
           throws TaskException
       {
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           getLogger().debug( m_cmdl.toString() );
           final String[] commandline = m_cmdl.getCommandline();
           exe.setCommandline( new Commandline( commandline ) );
  
  
  
  1.36      +2 -2      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.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- JUnitTask.java	10 Feb 2002 00:25:31 -0000	1.35
  +++ JUnitTask.java	10 Feb 2002 00:46:50 -0000	1.36
  @@ -22,7 +22,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
  @@ -650,7 +650,7 @@
           }
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           exe.setCommandline( new Commandline( cmd.getCommandline() ) );
           if( dir != null )
           {
  
  
  
  1.26      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
  
  Index: JJTree.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JJTree.java	10 Feb 2002 00:25:31 -0000	1.25
  +++ JJTree.java	10 Feb 2002 00:46:51 -0000	1.26
  @@ -14,7 +14,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  @@ -182,7 +182,7 @@
           cmdl.addVmArgument( "-Dinstall.root=" + javaccHome.getAbsolutePath() );
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           getLogger().debug( cmdl.toString() );
           exe.setCommandline( new Commandline( cmdl.getCommandline() ) );
   
  
  
  
  1.21      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
  
  Index: JavaCC.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- JavaCC.java	10 Feb 2002 00:25:31 -0000	1.20
  +++ JavaCC.java	10 Feb 2002 00:46:51 -0000	1.21
  @@ -14,7 +14,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  @@ -243,7 +243,7 @@
           {
               getLogger().debug( cmdline.toString() );
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               final String[] commandline = cmdline.getCommandline();
               exe.setCommandline( new Commandline( commandline ) );
               int retval = exe.execute();
  
  
  
  1.25      +2 -2      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.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- JDependTask.java	10 Feb 2002 00:25:31 -0000	1.24
  +++ JDependTask.java	10 Feb 2002 00:46:51 -0000	1.25
  @@ -14,7 +14,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
   import org.apache.tools.ant.types.Path;
  @@ -241,7 +241,7 @@
           }
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
   
           final String[] commandline1 = commandline.getCommandline();
           exe.setCommandline( new Commandline( commandline1 ) );
  
  
  
  1.25      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Javadoc.java	10 Feb 2002 00:25:31 -0000	1.24
  +++ Javadoc.java	10 Feb 2002 00:46:51 -0000	1.25
  @@ -21,7 +21,7 @@
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.framework.Pattern;
   import org.apache.tools.ant.Task;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -815,7 +815,7 @@
           getLogger().info( "Javadoc execution" );
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           exe.setExecOutputHandler( this );
   
           /*
  
  
  
  1.30      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Java.java	10 Feb 2002 00:25:31 -0000	1.29
  +++ Java.java	10 Feb 2002 00:46:51 -0000	1.30
  @@ -14,7 +14,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -219,7 +219,7 @@
           throws TaskException
       {
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
   
           if( m_dir == null )
           {
  
  
  
  1.1                  jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/framework/Execute.java
  
  Index: Execute.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.myrmidon.framework;
  
  import java.io.File;
  import java.io.IOException;
  import java.util.Properties;
  import org.apache.aut.nativelib.ExecException;
  import org.apache.aut.nativelib.ExecManager;
  import org.apache.aut.nativelib.ExecMetaData;
  import org.apache.aut.nativelib.ExecOutputHandler;
  import org.apache.myrmidon.api.TaskException;
  import org.apache.tools.ant.types.Commandline;
  
  /**
   * This is a utility class designed to make executing native
   * processes easier in the context of ant.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @author <a href="mailto:thomas.haas@softwired-inc.com">Thomas Haas</a>
   * @version $Revision: 1.1 $ $Date: 2002/02/10 00:46:51 $
   */
  public class Execute
  {
      private Commandline m_command;
      private Properties m_environment = new Properties();
      private File m_workingDirectory = new File( "." );
      private boolean m_newEnvironment;
      private ExecOutputHandler m_handler;
      private long m_timeout;
      private ExecManager m_execManager;
      private Integer m_returnCode;
  
      public Execute( final ExecManager execManager )
      {
          m_execManager = execManager;
      }
  
      public void setTimeout( final long timeout )
      {
          m_timeout = timeout;
      }
  
      public void setExecOutputHandler( final ExecOutputHandler handler )
      {
          m_handler = handler;
      }
  
      /**
       * Sets the commandline of the subprocess to launch.
       *
       * @param command the commandline of the subprocess to launch
       */
      public void setCommandline( final Commandline command )
      {
          m_command = command;
      }
  
      public Commandline getCommandline()
      {
          if( null == m_command )
          {
              m_command = new Commandline();
          }
          return m_command;
      }
  
      public void setEnvironment( final Properties environment )
      {
          if( null == environment )
          {
              throw new NullPointerException( "environment" );
          }
          m_environment = environment;
      }
  
      /**
       * Set whether to propagate the default environment or not.
       *
       * @param newEnvironment whether to propagate the process environment.
       */
      public void setNewenvironment( boolean newEnvironment )
      {
          m_newEnvironment = newEnvironment;
      }
  
      /**
       * Sets the working directory of the process to execute. <p>
       *
       * @param workingDirectory the working directory of the process.
       */
      public void setWorkingDirectory( final File workingDirectory )
      {
          m_workingDirectory = workingDirectory;
      }
  
      public void setReturnCode( final int returnCode )
      {
          m_returnCode = new Integer( returnCode );
      }
  
      /**
       * Runs a process defined by the command line and returns its exit status.
       *
       * @return the exit status of the subprocess or <code>INVALID</code>
       */
      public int execute()
          throws IOException, TaskException
      {
          final int returnCode = executenativeProcess();
  
          if( null != m_returnCode &&
              returnCode != m_returnCode.intValue() )
          {
              throw new TaskException( "Unexpected return code " + returnCode );
          }
  
          return returnCode;
      }
  
      private int executenativeProcess()
          throws TaskException
      {
          final ExecMetaData metaData = buildExecMetaData();
          try
          {
              if( null != m_handler )
              {
                  return m_execManager.execute( metaData, m_handler, m_timeout );
              }
              else
              {
                  return m_execManager.execute( metaData,
                                                null,
                                                System.out,
                                                System.err,
                                                m_timeout );
              }
          }
          catch( final ExecException ee )
          {
              throw new TaskException( ee.getMessage(), ee );
          }
          catch( final IOException ioe )
          {
              throw new TaskException( ioe.getMessage(), ioe );
          }
      }
  
      /**
       * Utility method to create an ExecMetaData object
       * to pass to the ExecManager service.
       */
      private ExecMetaData buildExecMetaData()
      {
          final String[] command = m_command.getCommandline();
  
          return new ExecMetaData( command,
                                   m_environment,
                                   m_workingDirectory,
                                   m_newEnvironment );
      }
  }
  
  
  
  1.10      +5 -5      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java
  
  Index: Exec.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/nativelib/Exec.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Exec.java	10 Feb 2002 00:25:31 -0000	1.9
  +++ Exec.java	10 Feb 2002 00:46:51 -0000	1.10
  @@ -16,7 +16,7 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.EnvironmentData;
  @@ -111,12 +111,12 @@
           validate();
           if( null == m_os || Os.isFamily( m_os ) )
           {
  -            final Execute2 exe = createExecute();
  +            final Execute exe = createExecute();
               doExecute( exe );
           }
       }
   
  -    private void doExecute( final Execute2 exe )
  +    private void doExecute( final Execute exe )
           throws TaskException
       {
           try
  @@ -165,7 +165,7 @@
           }
       }
   
  -    private Execute2 createExecute()
  +    private Execute createExecute()
           throws TaskException
       {
           final Properties environment = m_env.getVariables();
  @@ -173,7 +173,7 @@
           logExecDetails( environment );
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           exe.setTimeout( m_timeout );
           exe.setWorkingDirectory( m_dir );
           exe.setNewenvironment( m_newEnvironment );
  
  
  
  1.31      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- DefaultCompilerAdapter.java	10 Feb 2002 00:25:31 -0000	1.30
  +++ DefaultCompilerAdapter.java	10 Feb 2002 00:46:51 -0000	1.31
  @@ -17,7 +17,7 @@
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.taskdefs.Javac;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
   import org.apache.tools.ant.types.PathUtil;
  @@ -362,7 +362,7 @@
               try
               {
                   final ExecManager execManager = (ExecManager)m_attributes.getService( ExecManager.class
);
  -                final Execute2 exe = new Execute2( execManager );
  +                final Execute exe = new Execute( execManager );
                   exe.setWorkingDirectory( m_baseDir );
                   final String[] commandline = commandArray;
                   exe.setCommandline( new Commandline( commandline ) );
  
  
  
  1.23      +3 -3      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java
  
  Index: Cvs.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/cvslib/Cvs.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Cvs.java	10 Feb 2002 00:25:31 -0000	1.22
  +++ Cvs.java	10 Feb 2002 00:46:51 -0000	1.23
  @@ -13,7 +13,7 @@
   import org.apache.aut.nativelib.ExecManager;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.util.FileUtils;
   
  @@ -24,7 +24,7 @@
    * @author <a href="mailto:costin@dnt.ro">costin@dnt.ro</a>
    * @author <a href="mailto:stefano@apache.org">stefano@apache.org</a>
    * @author <a href="mailto:wwerner@picturesafe.de">Wolfgang Werner</a>
  - * @version $Revision: 1.22 $ $Date: 2002/02/10 00:25:31 $
  + * @version $Revision: 1.23 $ $Date: 2002/02/10 00:46:51 $
    * @ant:task name="cvs"
    */
   public class Cvs
  @@ -149,7 +149,7 @@
           final Properties env = buildEnvironment();
   
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           if( m_dest == null )
           {
               m_dest = getBaseDirectory();
  
  
  
  1.22      +2 -2      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- CovReport.java	10 Feb 2002 00:25:31 -0000	1.21
  +++ CovReport.java	10 Feb 2002 00:46:51 -0000	1.22
  @@ -20,7 +20,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.EnumeratedAttribute;
   import org.apache.tools.ant.types.Path;
  @@ -248,7 +248,7 @@
   
               // use the custom handler for stdin issues
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               getLogger().debug( cmdl.toString() );
               exe.setCommandline( cmdl );
               int exitValue = exe.execute();
  
  
  
  1.21      +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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CovMerge.java	10 Feb 2002 00:25:31 -0000	1.20
  +++ CovMerge.java	10 Feb 2002 00:46:51 -0000	1.21
  @@ -16,7 +16,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -116,7 +116,7 @@
               cmdl.addArgument( "-jp_paramfile=" + paramfile.getAbsolutePath() );
   
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               getLogger().debug( cmdl.toString() );
               exe.setCommandline( cmdl );
   
  
  
  
  1.22      +2 -2      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.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- Coverage.java	10 Feb 2002 00:25:31 -0000	1.21
  +++ Coverage.java	10 Feb 2002 00:46:51 -0000	1.22
  @@ -16,7 +16,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -250,7 +250,7 @@
   
               // use the custom handler for stdin issues
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               getLogger().debug( cmdl.toString() );
               exe.setCommandline( cmdl );
               int exitValue = exe.execute();
  
  
  
  1.21      +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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Continuus.java	10 Feb 2002 00:25:31 -0000	1.20
  +++ Continuus.java	10 Feb 2002 00:46:51 -0000	1.21
  @@ -13,7 +13,7 @@
   import org.apache.aut.nativelib.ExecOutputHandler;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -113,7 +113,7 @@
           try
           {
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               if( null != handler )
               {
                   exe.setExecOutputHandler( handler );
  
  
  
  1.18      +2 -2      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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ClearCase.java	10 Feb 2002 00:25:31 -0000	1.17
  +++ ClearCase.java	10 Feb 2002 00:46:51 -0000	1.18
  @@ -12,7 +12,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   
   /**
  @@ -109,7 +109,7 @@
           try
           {
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               exe.setWorkingDirectory( getBaseDirectory() );
               exe.setCommandline( cmd );
               return exe.execute();
  
  
  
  1.27      +2 -2      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java
  
  Index: Cab.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Cab.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Cab.java	10 Feb 2002 00:25:31 -0000	1.26
  +++ Cab.java	10 Feb 2002 00:46:51 -0000	1.27
  @@ -18,7 +18,7 @@
   import org.apache.aut.nativelib.Os;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.taskdefs.MatchingTask;
  -import org.apache.tools.ant.taskdefs.exec.Execute2;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.DirectoryScanner;
   import org.apache.tools.ant.types.FileSet;
  @@ -136,7 +136,7 @@
               {
                   File listFile = createListFile( files );
                   final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -                Execute2 exe = new Execute2( execManager );
  +                Execute exe = new Execute( execManager );
                   exe.setWorkingDirectory( m_baseDir );
                   final Commandline cmd = createCommand( listFile );
                   exe.setCommandline( cmd );
  
  
  
  1.24      +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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ANTLR.java	10 Feb 2002 00:25:32 -0000	1.23
  +++ ANTLR.java	10 Feb 2002 00:46:51 -0000	1.24
  @@ -16,7 +16,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.CommandlineJava;
  @@ -228,7 +228,7 @@
           throws TaskException
       {
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           if( workingdir != null )
           {
               exe.setWorkingDirectory( workingdir );
  
  
  
  1.23      +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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- BorlandGenerateClient.java	10 Feb 2002 00:25:32 -0000	1.22
  +++ BorlandGenerateClient.java	10 Feb 2002 00:46:51 -0000	1.23
  @@ -11,7 +11,7 @@
   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.myrmidon.framework.Execute;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.Path;
  @@ -162,7 +162,7 @@
               getLogger().debug( "Calling java2iiop" );
   
               final ExecManager execManager = (ExecManager)getService( ExecManager.class
);
  -            final Execute2 exe = new Execute2( execManager );
  +            final Execute exe = new Execute( execManager );
               exe.setWorkingDirectory( new File( "." ) );
               exe.setCommandline( cmd );
               exe.execute();
  
  
  
  1.20      +2 -2      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- BorlandDeploymentTool.java	6 Feb 2002 13:38:00 -0000	1.19
  +++ BorlandDeploymentTool.java	10 Feb 2002 00:46:51 -0000	1.20
  @@ -19,7 +19,7 @@
   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;
  +import org.apache.myrmidon.framework.Execute;
   import org.apache.tools.ant.taskdefs.exec.ExecuteStreamHandler;
   import org.apache.tools.ant.types.Argument;
   import org.apache.tools.ant.types.Commandline;
  @@ -363,7 +363,7 @@
       private void buildBorlandStubs( Iterator ithomes, Hashtable files )
       {
           final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  -        final Execute2 exe = new Execute2( execManager );
  +        final Execute exe = new Execute( execManager );
           exe.setWorkingDirectory( getTask().getBaseDirectory() );
   
           final Commandline cmd = buildCommandline( ithomes );
  
  
  

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