cvs commit: ant/src/main/org/apache/tools/ant/taskdefs GenerateKey.java
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 ChangesPath
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 - 1.1.2.13
+++ CONTRIBUTORS 4 Jun 2004 07:47:59 - 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 - 1.503.2.96
+++ WHATSNEW 4 Jun 2004 07:47:59 - 1.503.2.97
@@ -96,6 +96,9 @@
* Using could break XmlLogger. Bugzilla Report 28993.
+* 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 - 1.22.2.4
+++ GenerateKey.java 4 Jun 2004 07:47:59 - 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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs GenerateKey.java
bodewig 2004/06/04 00:44:54
Modified:.CONTRIBUTORS WHATSNEW
src/main/org/apache/tools/ant/taskdefs GenerateKey.java
Log:
Make independent of PATH.
PR: 29382
Submitted by: Mark Hecker
Revision ChangesPath
1.21 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- CONTRIBUTORS 3 Jun 2004 08:08:11 - 1.20
+++ CONTRIBUTORS 4 Jun 2004 07:44:53 - 1.21
@@ -110,6 +110,7 @@
Marcel Schutte
Marcus Börger
Mariusz Nowostawski
+Mark Hecker
Martijn Kruithof
Martin Landers
Martin Poeschl
1.613 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- WHATSNEW 2 Jun 2004 21:18:41 - 1.612
+++ WHATSNEW 4 Jun 2004 07:44:53 - 1.613
@@ -126,6 +126,9 @@
* Using could break XmlLogger. Bugzilla Report 28993.
+* no longer requires keytool to be in your PATH. Bugzilla
+ Report 29382.
+
Other changes:
--
* doc fix concerning the dependencies of the ftp task
1.28 +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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- GenerateKey.java 22 Apr 2004 14:48:31 - 1.27
+++ GenerateKey.java 4 Jun 2004 07:44:54 - 1.28
@@ -355,7 +355,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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
