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/java/org/apache/antlib/cvslib Cvs.java
Date Sun, 03 Feb 2002 10:28:46 GMT
donaldp     02/02/03 02:28:46

  Modified:    proposal/myrmidon/src/java/org/apache/antlib/security
                        SignJar.java GenerateKey.java
               proposal/myrmidon/src/java/org/apache/antlib/nativelib
                        Exec.java
               proposal/myrmidon/src/java/org/apache/antlib/cvslib Cvs.java
  Log:
  Add a constructor to Execute2 that takes the ExecManager service
  
  Revision  Changes    Path
  1.6       +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/SignJar.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SignJar.java	2 Feb 2002 15:44:20 -0000	1.5
  +++ SignJar.java	3 Feb 2002 10:28:46 -0000	1.6
  @@ -20,6 +20,7 @@
   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;
   
   /**
    * Sign a archive.
  @@ -294,7 +295,8 @@
           getLogger().info( message );
   
           final Commandline cmd = buildCommand( jarTarget, jarSource );
  -        final Execute2 exe = new Execute2();
  +        final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  +        final Execute2 exe = new Execute2( execManager );
           setupLogger( exe );
           exe.setCommandline( cmd );
           try
  
  
  
  1.4       +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/antlib/security/GenerateKey.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GenerateKey.java	2 Feb 2002 15:44:20 -0000	1.3
  +++ GenerateKey.java	3 Feb 2002 10:28:46 -0000	1.4
  @@ -12,6 +12,7 @@
   import org.apache.myrmidon.api.TaskException;
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
  +import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Generates a key.
  @@ -120,7 +121,8 @@
           getLogger().info( message );
   
           final Commandline cmd = createCommand();
  -        final Execute2 exe = new Execute2();
  +        final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  +        final Execute2 exe = new Execute2( execManager );
           exe.setWorkingDirectory( getBaseDirectory() );
           exe.setCommandline( cmd );
           try
  
  
  
  1.7       +3 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Exec.java	2 Feb 2002 15:43:46 -0000	1.6
  +++ Exec.java	3 Feb 2002 10:28:46 -0000	1.7
  @@ -11,6 +11,7 @@
   import java.io.IOException;
   import java.util.Properties;
   import org.apache.aut.nativelib.Os;
  +import org.apache.aut.nativelib.ExecManager;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.AbstractTask;
  @@ -171,7 +172,8 @@
   
           logExecDetails( environment );
   
  -        final Execute2 exe = new Execute2();
  +        final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  +        final Execute2 exe = new Execute2( execManager );
           setupLogger( exe );
           exe.setTimeout( m_timeout );
           exe.setWorkingDirectory( m_dir );
  
  
  
  1.20      +4 -2      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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Cvs.java	2 Feb 2002 15:43:29 -0000	1.19
  +++ Cvs.java	3 Feb 2002 10:28:46 -0000	1.20
  @@ -15,6 +15,7 @@
   import org.apache.tools.ant.taskdefs.exec.Execute2;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.util.FileUtils;
  +import org.apache.aut.nativelib.ExecManager;
   
   /**
    * Task to interact with a CVS repository.
  @@ -23,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.19 $ $Date: 2002/02/02 15:43:29 $
  + * @version $Revision: 1.20 $ $Date: 2002/02/03 10:28:46 $
    * @ant:task name="cvs"
    */
   public class Cvs
  @@ -147,7 +148,8 @@
           final Commandline command = buildCommandline();
           final Properties env = buildEnvironment();
   
  -        final Execute2 exe = new Execute2();
  +        final ExecManager execManager = (ExecManager)getService( ExecManager.class );
  +        final Execute2 exe = new Execute2( execManager );
           setupLogger( exe );
           if( m_dest == null ) {
             m_dest = getBaseDirectory();
  
  
  

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