ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs GenerateKey.java
Date Fri, 04 Jun 2004 07:48:00 GMT
bodewig     2004/06/04 00:47:59

  Modified:    .        Tag: ANT_16_BRANCH CONTRIBUTORS WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        GenerateKey.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.14  +1 -0      ant/CONTRIBUTORS
  
  Index: CONTRIBUTORS
  ===================================================================
  RCS file: /home/cvs/ant/CONTRIBUTORS,v
  retrieving revision 1.1.2.13
  retrieving revision 1.1.2.14
  diff -u -r1.1.2.13 -r1.1.2.14
  --- CONTRIBUTORS	3 Jun 2004 08:10:17 -0000	1.1.2.13
  +++ CONTRIBUTORS	4 Jun 2004 07:47:59 -0000	1.1.2.14
  @@ -108,6 +108,7 @@
   Marcel Schutte
   Marcus Börger
   Mariusz Nowostawski
  +Mark Hecker
   Martijn Kruithof
   Martin Landers
   Martin Poeschl
  
  
  
  1.503.2.97 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.96
  retrieving revision 1.503.2.97
  diff -u -r1.503.2.96 -r1.503.2.97
  --- WHATSNEW	2 Jun 2004 21:22:36 -0000	1.503.2.96
  +++ WHATSNEW	4 Jun 2004 07:47:59 -0000	1.503.2.97
  @@ -96,6 +96,9 @@
   
   * Using <macrodef> could break XmlLogger. Bugzilla Report 28993.
   
  +* <genkey> no longer requires keytool to be in your PATH.  Bugzilla
  +  Report 29382.
  +
   Other changes:
   --------------
   * doc fix concerning the dependencies of the ftp task
  
  
  
  No                   revision
  No                   revision
  1.22.2.5  +1 -1      ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java
  
  Index: GenerateKey.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java,v
  retrieving revision 1.22.2.4
  retrieving revision 1.22.2.5
  diff -u -r1.22.2.4 -r1.22.2.5
  --- GenerateKey.java	9 Mar 2004 17:01:33 -0000	1.22.2.4
  +++ GenerateKey.java	4 Jun 2004 07:47:59 -0000	1.22.2.5
  @@ -360,7 +360,7 @@
   
           log("Generating Key for " + alias);
           final ExecTask cmd = (ExecTask) getProject().createTask("exec");
  -        cmd.setExecutable("keytool");
  +        cmd.setExecutable(JavaEnvUtils.getJdkExecutable("keytool"));
           Commandline.Argument arg = cmd.createArg();
           arg.setLine(sb.toString());
           cmd.setFailonerror(true);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message