donaldp 02/01/26 18:32:05
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:
Made Execute2 only take Commandlin objects rather than an arrya of strings
Revision Changes Path
1.4 +1 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SignJar.java 27 Jan 2002 00:17:51 -0000 1.3
+++ SignJar.java 27 Jan 2002 02:32:04 -0000 1.4
@@ -295,7 +295,7 @@
final Commandline cmd = buildCommand( jarTarget, jarSource );
final Execute2 exe = new Execute2();
setupLogger( exe );
- exe.setCommandline( cmd.getCommandline() );
+ exe.setCommandline( cmd );
try
{
exe.execute();
1.2 +1 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GenerateKey.java 25 Jan 2002 23:56:44 -0000 1.1
+++ GenerateKey.java 27 Jan 2002 02:32:04 -0000 1.2
@@ -121,7 +121,7 @@
final Commandline cmd = createCommand();
final Execute2 exe = new Execute2();
exe.setWorkingDirectory( getBaseDirectory() );
- exe.setCommandline( cmd.getCommandline() );
+ exe.setCommandline( cmd );
try
{
exe.execute();
1.5 +1 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Exec.java 20 Jan 2002 17:32:58 -0000 1.4
+++ Exec.java 27 Jan 2002 02:32:04 -0000 1.5
@@ -176,7 +176,7 @@
exe.setWorkingDirectory( m_dir );
exe.setNewenvironment( m_newEnvironment );
exe.setEnvironment( environment );
- exe.setCommandline( m_command.getCommandline() );
+ exe.setCommandline( m_command );
return exe;
}
1.18 +2 -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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Cvs.java 20 Jan 2002 17:32:57 -0000 1.17
+++ Cvs.java 27 Jan 2002 02:32:05 -0000 1.18
@@ -23,7 +23,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Wolfgang Werner</a>
- * @version $Revision: 1.17 $ $Date: 2002/01/20 17:32:57 $
+ * @version $Revision: 1.18 $ $Date: 2002/01/27 02:32:05 $
*/
public class Cvs
extends AbstractTask
@@ -153,7 +153,7 @@
}
exe.setWorkingDirectory( m_dest );
- exe.setCommandline( command.getCommandline() );
+ exe.setCommandline( command );
exe.setEnvironment( env );
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
