You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@locus.apache.org on 2000/08/10 08:51:52 UTC

cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs GenerateKey.java SignJar.java

bodewig     00/08/09 23:51:52

  Modified:    src/main/org/apache/tools/ant/taskdefs GenerateKey.java
                        SignJar.java
  Log:
  Make <genkey> and <signjar> work again - they've been broken since
  <exec> became ExecTask instead of Exec.
  
  Revision  Changes    Path
  1.2       +5 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GenerateKey.java	2000/08/03 08:47:15	1.1
  +++ GenerateKey.java	2000/08/10 06:51:51	1.2
  @@ -54,6 +54,7 @@
   package org.apache.tools.ant.taskdefs;
   
   import org.apache.tools.ant.*;
  +import org.apache.tools.ant.types.Commandline;
   import java.util.Enumeration;
   import java.util.Vector;
   
  @@ -326,10 +327,10 @@
           } 
   
           log("Generating Key for " + alias );
  -        final Exec cmd = (Exec) project.createTask("exec");
  -        cmd.setCommand(sb.toString());
  -		cmd.setFailonerror("true");
  -		cmd.setTaskName( getTaskName() );
  +        final ExecTask cmd = (ExecTask) project.createTask("exec");
  +        cmd.setCommand(new Commandline(sb.toString()));
  +        cmd.setFailonerror(true);
  +        cmd.setTaskName( getTaskName() );
           cmd.execute();
       } 
   }
  
  
  
  1.3       +4 -3      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java
  
  Index: SignJar.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/SignJar.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SignJar.java	2000/07/14 06:55:46	1.2
  +++ SignJar.java	2000/08/10 06:51:51	1.3
  @@ -54,6 +54,7 @@
   package org.apache.tools.ant.taskdefs;
   
   import org.apache.tools.ant.*;
  +import org.apache.tools.ant.types.Commandline;
   import java.io.File;
   
   /**
  @@ -208,9 +209,9 @@
           sb.append("\" ");
   
           log("Signing Jar : " + (new File(jar)).getAbsolutePath());
  -        final Exec cmd = (Exec) project.createTask("exec");
  -        cmd.setCommand(sb.toString());
  -        cmd.setFailonerror("true");
  +        final ExecTask cmd = (ExecTask) project.createTask("exec");
  +        cmd.setCommand(new Commandline(sb.toString()));
  +        cmd.setFailonerror(true);
           cmd.setTaskName( getTaskName() );
           cmd.execute();
       }