cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.java
bodewig 2004/04/08 07:58:19
Modified:src/main/org/apache/tools/ant/taskdefs Ant.java
Log:
Don't die if the ant.file property hasn't been set.
Jelly's Ant tag library currently doesn't set this property and each
task used in Jelly will result in an NPE otherwise.
Revision ChangesPath
1.100 +5 -3 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- Ant.java 9 Mar 2004 16:48:03 - 1.99
+++ Ant.java 8 Apr 2004 14:58:19 - 1.100
@@ -321,11 +321,13 @@
+ " in build file " + antFile, Project.MSG_VERBOSE);
newProject.setUserProperty("ant.file" , antFile);
+String thisAntFile = getProject().getProperty("ant.file");
// Are we trying to call the target in which we are defined (or
// the build file if this is a top level task)?
-if (newProject.resolveFile(newProject.getProperty("ant.file"))
-.equals(getProject().resolveFile(getProject()
-.getProperty("ant.file"))) && getOwningTarget() != null) {
+if (thisAntFile != null
+&& newProject.resolveFile(newProject.getProperty("ant.file"))
+.equals(getProject().resolveFile(thisAntFile))
+&& getOwningTarget() != null) {
if (getOwningTarget().getName().equals("")) {
if (getTaskName().equals("antcall")) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Ant.java
bodewig 2004/04/08 07:59:52
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Ant.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.92.2.7 +4 -2 ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.92.2.6
retrieving revision 1.92.2.7
diff -u -r1.92.2.6 -r1.92.2.7
--- Ant.java 9 Mar 2004 17:01:32 - 1.92.2.6
+++ Ant.java 8 Apr 2004 14:59:52 - 1.92.2.7
@@ -322,10 +322,12 @@
+ " in build file " + antFile, Project.MSG_VERBOSE);
newProject.setUserProperty("ant.file" , antFile);
+String thisAntFile = getProject().getProperty("ant.file");
// Are we trying to call the target in which we are defined (or
// the build file if this is a top level task)?
-if (newProject.getProperty("ant.file")
-.equals(getProject().getProperty("ant.file"))
+if (thisAntFile != null
+&& newProject.resolveFile(newProject.getProperty("ant.file"))
+.equals(getProject().resolveFile(thisAntFile))
&& getOwningTarget() != null) {
if (getOwningTarget().getName().equals("")) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks chgrp.html
bodewig 2004/04/13 00:15:53 Modified:docs/manual/OptionalTasks chgrp.html Log: 2004 Revision ChangesPath 1.6 +1 -1 ant/docs/manual/OptionalTasks/chgrp.html Index: chgrp.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/chgrp.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- chgrp.html8 Apr 2004 17:19:40 - 1.5 +++ chgrp.html13 Apr 2004 07:15:53 - 1.6 @@ -127,7 +127,7 @@ -Copyright © 2002-2003 Apache Software +Copyright © 2002-2004 Apache Software Foundation. All rights Reserved. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks exec.html
bodewig 2004/04/13 03:36:42 Modified:docs/manual/CoreTasks exec.html Log: Add RedHat S/390 hint submitted by Jack Woehr Revision ChangesPath 1.40 +24 -0 ant/docs/manual/CoreTasks/exec.html Index: exec.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/exec.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- exec.html 27 Mar 2004 21:22:58 - 1.39 +++ exec.html 13 Apr 2004 10:36:42 - 1.40 @@ -48,6 +48,30 @@ set to true instead as this task will follow the VM's interpretation of exit codes. +RedHat S/390 Users + +It has been http://listserv.uark.edu/scripts/wa.exe?A1=ind0404&L=vmesa-l#33";>reported +on the VMESA-LISTSERV that shell scripts invoked via the Ant Exec +task must have their interpreter specified, i.e., the scripts must +start with something like: + + + +#!/bin/bash + + + +or the task will fail as follows: + + + +[exec] Warning: UNIXProcess.forkAndExec native error: Exec format error +[exec] Result: 255 + + + + Parameters - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks exec.html
bodewig 2004/04/13 03:37:11 Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH exec.html Log: merge Revision ChangesPath No revision No revision 1.34.2.6 +24 -0 ant/docs/manual/CoreTasks/exec.html Index: exec.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/exec.html,v retrieving revision 1.34.2.5 retrieving revision 1.34.2.6 diff -u -r1.34.2.5 -r1.34.2.6 --- exec.html 9 Feb 2004 22:12:07 - 1.34.2.5 +++ exec.html 13 Apr 2004 10:37:11 - 1.34.2.6 @@ -49,6 +49,30 @@ set to true instead as this task will follow the VM's interpretation of exit codes. +RedHat S/390 Users + +It has been http://listserv.uark.edu/scripts/wa.exe?A1=ind0404&L=vmesa-l#33";>reported +on the VMESA-LISTSERV that shell scripts invoked via the Ant Exec +task must have their interpreter specified, i.e., the scripts must +start with something like: + + + +#!/bin/bash + + + +or the task will fail as follows: + + + +[exec] Warning: UNIXProcess.forkAndExec native error: Exec format error +[exec] Result: 255 + + + + Parameters - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
bodewig 2004/04/13 04:09:01
Modified:docs/manual/OptionalTasks scp.html
src/main/org/apache/tools/ant/taskdefs/optional/ssh Scp.java
Log:
Add special local/remote variants of the file and todir attributes to
explicitly state what is local or remote.
Document verbose attribute.
Submitted by: Rami Ojares
Revision ChangesPath
1.13 +45 -3 ant/docs/manual/OptionalTasks/scp.html
Index: scp.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scp.html 9 Feb 2004 21:50:08 - 1.12
+++ scp.html 13 Apr 2004 11:09:01 - 1.13
@@ -20,7 +20,7 @@
in the Ant distribution. See Library Dependencies
for more information. This task has been tested with jsch-0.1.2 to
-jsch-0.1.9.
+jsch-0.1.14.
Parameters
@@ -34,19 +34,54 @@
The file to copy. This can be a local path or a
remote path of the form user[:[EMAIL PROTECTED]:/directory/path.
:password can be ommitted if you use key based
-authentication or specify the password attribute.
+authentication or specify the password attribute. The way remote
+path is recognized is whether it contains @ character or not. This
+will not work if your localPath contains @ character.
Yes, unless a nested
<fileset> element is used.
+localFile
+This is an alternative to the file attribute. But
+this must always point to a local file. The reason this was added
+was that when you give file attribute it is treated as remote if
+it contains @ character. This character can exist also in local
+paths. since Ant 1.6.2
+Alternative to file attribute.
+
+
+remoteFile
+This is an alternative to the file attribute. But
+this must always point to a remote file. since Ant 1.6.2
+Alternative to file attribute.
+
+
todir
The directory to copy to. This can be a local path
or a remote path of the form user[:[EMAIL
PROTECTED]:/directory/path.
:password can be ommitted if you use key based
-authentication or specify the password attribute.
+authentication or specify the password attribute. The way remote
+path is recognized is whether it contains @ character or not. This
+will not work if your localPath contains @ character.
Yes
+localTodir
+This is an alternative to the todir
+attribute. But this must always point to a local directory. The
+reason this was added was that when you give todir attribute it is
+treated as remote if it contains @ character. This character can
+exist also in local paths. since Ant 1.6.2
+Alternative to todir attribute.
+
+
+remoteTodir
+This is an alternative to the todir
+attribute. But this must always point to a remote directory.
+since Ant 1.6.2
+Alternative to todir attribute.
+
+
port
The port to connect to on the remote host.
No, defaults to 22.
@@ -91,6 +126,13 @@
Passphrase for your private key.
Yes, if you are using key based
authentication.
+
+
+verbose
+Determines whether SCP outputs verbosely to the
+user. Currently this means outputting dots/stars showing the
+progress of a file transfer. since Ant 1.6.2
+No; defaults to false.
Parameters specified as nested elements
1.16 +43 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java
Index: Scp.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/Scp.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Scp.java 7 Apr 2004 13:30:30 - 1.15
+++ Scp.java 13 Apr 2004 11:09:01 - 1.16
@@ -43,6 +43,7 @@
private String fromUri;
private String toUri;
private List fileSets = null;
+private boolean isFromRemote, isToRemote;
/**
* Sets the file to be transferred. This can either be a remote
@@ -55,6 +56,7 @@
*/
public void setFile(String aFromUri) {
this.fromUri = aFromUri;
+this.isFromRemote = isRemoteUri(this.fromUri);
}
/**
@@ -68,9 +70,50 @@
*/
public void setTodir(String aToUri) {
this.toUri = aToUri;
+this.isToRemote = isRemoteUri(this.toUri);
}
+/**
+ * Similiar to [EMAIL PROTECTED] #setFile setFile} but explicitly states
that
+ * the file is a local file. This is the only way to specify a
+ * local file with a @ character.
+ * @since Ant
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh AbstractSshMessage.java
bodewig 2004/04/13 04:20:15
Modified:src/main/org/apache/tools/ant/taskdefs/optional/ssh
AbstractSshMessage.java
Log:
less noisy verbose mode for by Rami Ojares
Revision ChangesPath
1.10 +18 -6
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java
Index: AbstractSshMessage.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractSshMessage.java 7 Apr 2004 13:30:30 - 1.9
+++ AbstractSshMessage.java 13 Apr 2004 11:20:14 - 1.10
@@ -138,14 +138,26 @@
protected final int trackProgress(int filesize, int totalLength,
int percentTransmitted) {
-int percent = (int) Math.round(Math.floor((totalLength
- / (double)filesize)
- * 100));
+int percent = (int) Math.round(Math.floor((totalLength /
+ (double)filesize) * 100));
+
if (percent > percentTransmitted) {
-if (filesize < 1048576 && (percent % 10 != 0)) {
-// do not track between tenths
+if (filesize < 1048576) {
+if (percent % 10 == 0) {
+if (percent == 100) {
+System.out.println(" 100%");
+} else {
+System.out.print("*");
+}
+}
} else {
-log("" + percent + "%");
+if (percent == 50) {
+System.out.println(" 50%");
+} else if (percent == 100) {
+System.out.println(" 100%");
+} else {
+System.out.print(".");
+}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh AbstractSshMessage.java SSHBase.java Scp.java ScpFromMessage.java ScpToMessage.java
bodewig 2004/04/13 04:26:13 Modified:.Tag: ANT_16_BRANCH CONTRIBUTORS docs/manual/OptionalTasks Tag: ANT_16_BRANCH scp.html src/main/org/apache/tools/ant/taskdefs/optional/ssh Tag: ANT_16_BRANCH AbstractSshMessage.java SSHBase.java Scp.java ScpFromMessage.java ScpToMessage.java Log: merge Revision ChangesPath No revision No revision 1.1.2.5 +3 -1 ant/CONTRIBUTORS Index: CONTRIBUTORS === RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- CONTRIBUTORS 5 Apr 2004 12:18:25 - 1.1.2.4 +++ CONTRIBUTORS 13 Apr 2004 11:26:13 - 1.1.2.5 @@ -65,6 +65,7 @@ Holger Engels Ingenonsya France Ingmar Stein +Jack J. Woehr James Duncan Davidson Jan Matèrne Jason Hunter @@ -146,8 +147,9 @@ Phillip Wells Pierre Delisle Pierre Dittgen -Raphael Pierquin R Handerson +Rami Ojares +Raphael Pierquin Richard Evans Rick Beton Robert Anderson No revision No revision 1.7.2.7 +45 -3 ant/docs/manual/OptionalTasks/scp.html Index: scp.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scp.html,v retrieving revision 1.7.2.6 retrieving revision 1.7.2.7 diff -u -r1.7.2.6 -r1.7.2.7 --- scp.html 9 Feb 2004 22:12:11 - 1.7.2.6 +++ scp.html 13 Apr 2004 11:26:13 - 1.7.2.7 @@ -21,7 +21,7 @@ in the Ant distribution. See Library Dependencies for more information. This task has been tested with jsch-0.1.2 to -jsch-0.1.9. +jsch-0.1.14. Parameters @@ -35,19 +35,54 @@ The file to copy. This can be a local path or a remote path of the form user[:[EMAIL PROTECTED]:/directory/path. :password can be ommitted if you use key based -authentication or specify the password attribute. +authentication or specify the password attribute. The way remote +path is recognized is whether it contains @ character or not. This +will not work if your localPath contains @ character. Yes, unless a nested <fileset> element is used. +localFile +This is an alternative to the file attribute. But +this must always point to a local file. The reason this was added +was that when you give file attribute it is treated as remote if +it contains @ character. This character can exist also in local +paths. since Ant 1.6.2 +Alternative to file attribute. + + +remoteFile +This is an alternative to the file attribute. But +this must always point to a remote file. since Ant 1.6.2 +Alternative to file attribute. + + todir The directory to copy to. This can be a local path or a remote path of the form user[:[EMAIL PROTECTED]:/directory/path. :password can be ommitted if you use key based -authentication or specify the password attribute. +authentication or specify the password attribute. The way remote +path is recognized is whether it contains @ character or not. This +will not work if your localPath contains @ character. Yes +localTodir +This is an alternative to the todir +attribute. But this must always point to a local directory. The +reason this was added was that when you give todir attribute it is +treated as remote if it contains @ character. This character can +exist also in local paths. since Ant 1.6.2 +Alternative to todir attribute. + + +remoteTodir +This is an alternative to the todir +attribute. But this must always point to a remote directory. +since Ant 1.6.2 +Alternative to todir attribute. + + port The port to connect to on the remote host. No, defaults to 22. @@ -92,6 +127,13 @@ Passphrase for your private key. Yes, if you are using key based authentication. + + +verbose +Determines whether SCP outputs verbosely to the +user. Currently this means outputting dots/stars showing the +progress of a file transfer. since Ant 1.6.2 +No; defaults to false. Parameters specified as nested elements No revision No revision 1.4.2.5 +50 -0 ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java Index: AbstractSshMessage.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.java,v retr
cvs commit: ant WHATSNEW
bodewig 2004/04/13 04:30:32 Modified:.Tag: ANT_16_BRANCH WHATSNEW Log: merge Revision ChangesPath No revision No revision 1.503.2.65 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.64 retrieving revision 1.503.2.65 diff -u -r1.503.2.64 -r1.503.2.65 --- WHATSNEW 1 Apr 2004 13:07:34 - 1.503.2.64 +++ WHATSNEW 13 Apr 2004 11:30:32 - 1.503.2.65 @@ -54,6 +54,10 @@ * add uid and gid to tarfileset. Bugzilla Report 19120. +* has a verbose attribute to get some feedback during the + transfer and new [local|remote][File|Todir] alternatives to file and + todir that explicitly state the direction of the transfer. + Changes from Ant 1.6.0 to Ant 1.6.1 === - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
bodewig 2004/04/13 04:30:47 Modified:.WHATSNEW Log: book-keeping Revision ChangesPath 1.581 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.580 retrieving revision 1.581 diff -u -r1.580 -r1.581 --- WHATSNEW 2 Apr 2004 20:20:43 - 1.580 +++ WHATSNEW 13 Apr 2004 11:30:47 - 1.581 @@ -121,6 +121,10 @@ * add uid and gid to tarfileset. Bugzilla Report 19120. +* has a verbose attribute to get some feedback during the + transfer and new [local|remote][File|Todir] alternatives to file and + todir that explicitly state the direction of the transfer. + Changes from Ant 1.6.0 to Ant 1.6.1 = - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java
bodewig 2004/04/13 04:40:08
Modified:.CONTRIBUTORS WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java
Log:
enable gcj's java -> native compilation.
Submitted by: Arnaud Vandyck
Revision ChangesPath
1.11 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CONTRIBUTORS 7 Apr 2004 22:46:51 - 1.10
+++ CONTRIBUTORS 13 Apr 2004 11:40:08 - 1.11
@@ -6,6 +6,7 @@
Anil K. Vijendran
Anli Shundi
Antoine Levy-Lambert
+Arnaud Vandyck
Arnout J. Kuiper
Aslak Hellesøy
Avik Sengupta
1.582 +5 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- WHATSNEW 13 Apr 2004 11:30:47 - 1.581
+++ WHATSNEW 13 Apr 2004 11:40:08 - 1.582
@@ -105,6 +105,11 @@
* failOnAny attribute for was broken. Bugzilla Report 28122.
+* If uses gcj and any of the nested s implies
+ compilation to native code (like -o or --main), Ant will not pass
+ the -C switch to gcj. This means you can now compile to native code
+ with gcj which has been impossible in Ant < 1.6.2.
+
Other changes:
--
1.20 +32 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
Index: Gcj.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Gcj.java 9 Mar 2004 16:48:13 - 1.19
+++ Gcj.java 13 Apr 2004 11:40:08 - 1.20
@@ -102,11 +102,42 @@
/**
* gcj should be set for generate class.
+ * ... if no 'compile to native' argument is passed
*/
-cmd.createArgument().setValue("-C");
+if (!isNativeBuild()) {
+cmd.createArgument().setValue("-C");
+}
addCurrentCompilerArgs(cmd);
return cmd;
}
+
+/**
+ * Whether any of the arguments given via <compilerarg>
+ * implies that compilation to native code is requested.
+ *
+ * @since Ant 1.6.2
+ */
+public boolean isNativeBuild() {
+boolean nativeBuild = false;
+String[] additionalArguments = getJavac().getCurrentCompilerArgs();
+int argsLength=0;
+while (!nativeBuild && argsLength < additionalArguments.length) {
+int conflictLength = 0;
+while (!nativeBuild
+ && conflictLength < CONFLICT_WITH_DASH_C.length) {
+nativeBuild = (additionalArguments[argsLength].startsWith
+ (CONFLICT_WITH_DASH_C[conflictLength]));
+conflictLength++;
+}
+argsLength++;
+}
+return nativeBuild;
+}
+
+private static final String [] CONFLICT_WITH_DASH_C = {
+"-o" , "--main=", "-D", "-fjni", "-L"
+};
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/compilers Gcj.java
bodewig 2004/04/13 04:40:18
Modified:.Tag: ANT_16_BRANCH CONTRIBUTORS WHATSNEW
src/main/org/apache/tools/ant/taskdefs/compilers Tag:
ANT_16_BRANCH Gcj.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.1.2.6 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- CONTRIBUTORS 13 Apr 2004 11:26:13 - 1.1.2.5
+++ CONTRIBUTORS 13 Apr 2004 11:40:18 - 1.1.2.6
@@ -6,6 +6,7 @@
Anil K. Vijendran
Anli Shundi
Antoine Levy-Lambert
+Arnaud Vandyck
Arnout J. Kuiper
Aslak Hellesøy
Avik Sengupta
1.503.2.66 +5 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.65
retrieving revision 1.503.2.66
diff -u -r1.503.2.65 -r1.503.2.66
--- WHATSNEW 13 Apr 2004 11:30:32 - 1.503.2.65
+++ WHATSNEW 13 Apr 2004 11:40:18 - 1.503.2.66
@@ -38,6 +38,11 @@
* swallowed the stack trace of exceptions thrown by the
executed program if run in the same VM.
+* If uses gcj and any of the nested s implies
+ compilation to native code (like -o or --main), Ant will not pass
+ the -C switch to gcj. This means you can now compile to native code
+ with gcj which has been impossible in Ant < 1.6.2.
+
Other changes:
--
No revision
No revision
1.14.2.6 +32 -1
ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java
Index: Gcj.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/compilers/Gcj.java,v
retrieving revision 1.14.2.5
retrieving revision 1.14.2.6
diff -u -r1.14.2.5 -r1.14.2.6
--- Gcj.java 9 Mar 2004 17:01:38 - 1.14.2.5
+++ Gcj.java 13 Apr 2004 11:40:18 - 1.14.2.6
@@ -102,11 +102,42 @@
/**
* gcj should be set for generate class.
+ * ... if no 'compile to native' argument is passed
*/
-cmd.createArgument().setValue("-C");
+if (!isNativeBuild()) {
+cmd.createArgument().setValue("-C");
+}
addCurrentCompilerArgs(cmd);
return cmd;
}
+
+/**
+ * Whether any of the arguments given via <compilerarg>
+ * implies that compilation to native code is requested.
+ *
+ * @since Ant 1.6.2
+ */
+public boolean isNativeBuild() {
+boolean nativeBuild = false;
+String[] additionalArguments = getJavac().getCurrentCompilerArgs();
+int argsLength=0;
+while (!nativeBuild && argsLength < additionalArguments.length) {
+int conflictLength = 0;
+while (!nativeBuild
+ && conflictLength < CONFLICT_WITH_DASH_C.length) {
+nativeBuild = (additionalArguments[argsLength].startsWith
+ (CONFLICT_WITH_DASH_C[conflictLength]));
+conflictLength++;
+}
+argsLength++;
+}
+return nativeBuild;
+}
+
+private static final String [] CONFLICT_WITH_DASH_C = {
+"-o" , "--main=", "-D", "-fjni", "-L"
+};
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/script ant.cmd antenv.cmd
bodewig 2004/04/14 08:33:31
Modified:.CONTRIBUTORS WHATSNEW
src/script ant.cmd antenv.cmd
Log:
Adapt the OS/2 wrapper scripts to the new launcher.
PR: 28226
Submitted by: Zdenek Wagner
Adapted to new license while I was at it.
Revision ChangesPath
1.12 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CONTRIBUTORS 13 Apr 2004 11:40:08 - 1.11
+++ CONTRIBUTORS 14 Apr 2004 15:33:31 - 1.12
@@ -192,3 +192,4 @@
Wolfgang Werner
Wolf Siberski
Yohann Roussel
+Zdenek Wagner
1.584 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- WHATSNEW 13 Apr 2004 21:46:02 - 1.583
+++ WHATSNEW 14 Apr 2004 15:33:31 - 1.584
@@ -133,6 +133,9 @@
transfer and new [local|remote][File|Todir] alternatives to file and
todir that explicitly state the direction of the transfer.
+* The OS/2 wrapper scripts have been adapted to use the new launcher.
+ Bugzilla Report 28226.
+
Changes from Ant 1.6.0 to Ant 1.6.1
=
1.2 +35 -14ant/src/script/ant.cmd
Index: ant.cmd
===
RCS file: /home/cvs/ant/src/script/ant.cmd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.cmd 23 Apr 2003 15:57:43 - 1.1
+++ ant.cmd 14 Apr 2004 15:33:31 - 1.2
@@ -1,10 +1,22 @@
/*
-Copyright (c) 2003 The Apache Software Foundation. All rights
-reserved.
-
-Run ant
+Copyright 2003-2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Run ant
*/
+'@echo off'
parse arg mode envarg '::' antarg
if mode\='.' & mode\='..' & mode\='/' then do
@@ -21,14 +33,7 @@
env="OS2ENVIRONMENT"
antenv = _getenv_('antenv')
-if _testenv_() = 0 then do
- interpret 'call "' || antenv || '"' '"' || envarg || '"'
- if _testenv_() = 0 then do
-say 'Ant environment is not set properly'
-x = endlocal()
-exit 16
- end
-end
+if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg ||
'"'
if mode = '' then mode = _getenv_('ANT_MODE' '..')
if mode \= '/' then do
@@ -39,15 +44,31 @@
interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
end
+if _testenv_() = 0 then do
+ say 'Ant environment is not set properly'
+ x = endlocal()
+ exit 16
+end
+
settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
java = _getenv_('javacmd' 'java')
opts = value('ANT_OPTS',,env)
args = value('ANT_ARGS',,env)
lcp = value('LOCALCLASSPATH',,env)
-if lcp\='' then lcp = '-cp' lcp
+cp = value('CLASSPATH',,env)
+if value('ANT_USE_CP',,env) \= '' then do
+ if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
+ lcp = lcp || cp
+ 'SET CLASSPATH='
+end
+if lcp\='' then lcp = '-classpath' lcp
-java opts lcp 'org.apache.tools.ant.Main' settings args antarg
+cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args
antarg
+launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
+if launcher = '' then entry = 'org.apache.tools.ant.Main'
+else entry = 'org.apache.tools.ant.launch.Launcher'
+java opts lcp entry settings args antarg
x = e
cvs commit: ant/src/script ant.cmd antenv.cmd envset.cmd runrc.cmd
bodewig 2004/04/14 08:35:55
Modified:src/script ant.cmd antenv.cmd envset.cmd runrc.cmd
Log:
Fix line-ends, one more wrong license
Revision ChangesPath
1.3 +92 -92ant/src/script/ant.cmd
Index: ant.cmd
===
RCS file: /home/cvs/ant/src/script/ant.cmd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ant.cmd 14 Apr 2004 15:33:31 - 1.2
+++ ant.cmd 14 Apr 2004 15:35:55 - 1.3
@@ -1,92 +1,92 @@
-/*
-Copyright 2003-2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Run ant
-*/
-
-'@echo off'
-parse arg mode envarg '::' antarg
-
-if mode\='.' & mode\='..' & mode\='/' then do
- envarg = mode envarg
- mode = ''
-end
-
-if antarg = '' then do
- antarg = envarg
- envarg = ''
-end
-
-x = setlocal()
-
-env="OS2ENVIRONMENT"
-antenv = _getenv_('antenv')
-if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg ||
'"'
-
-if mode = '' then mode = _getenv_('ANT_MODE' '..')
-if mode \= '/' then do
- runrc = _getenv_('runrc')
- antrc = _getenv_('antrc' 'antrc.cmd')
- if mode = '..' then mode = '-r'
- else mode = ''
- interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
-end
-
-if _testenv_() = 0 then do
- say 'Ant environment is not set properly'
- x = endlocal()
- exit 16
-end
-
-settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
-
-java = _getenv_('javacmd' 'java')
-opts = value('ANT_OPTS',,env)
-args = value('ANT_ARGS',,env)
-lcp = value('LOCALCLASSPATH',,env)
-cp = value('CLASSPATH',,env)
-if value('ANT_USE_CP',,env) \= '' then do
- if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
- lcp = lcp || cp
- 'SET CLASSPATH='
-end
-if lcp\='' then lcp = '-classpath' lcp
-
-cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args
antarg
-launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
-if launcher = '' then entry = 'org.apache.tools.ant.Main'
-else entry = 'org.apache.tools.ant.launch.Launcher'
-java opts lcp entry settings args antarg
-
-x = endlocal()
-
-return rc
-
-_testenv_: procedure expose env ANT_HOME JAVA_HOME
-ANT_HOME = value('ANT_HOME',,env)
-if ANT_HOME = '' then return 0
-JAVA_HOME = value('JAVA_HOME',,env)
-if JAVA_HOME = '' then return 0
-cp = translate(value('CLASSPATH',,env))
-if pos(translate(ANT_HOME), cp) = 0 then return 0
-if pos(translate(JAVA_HOME), cp) = 0 then return 0
-return 1
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
+/*
+Copyright 2003-2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Run ant
+*/
+
+'@echo off'
+parse arg mode envarg '::' antarg
+
+if mode\='.' & mode\='..' & mode\='/' then do
+
cvs commit: ant/src/script envset.cmd
bodewig 2004/04/14 08:36:25 Modified:src/script envset.cmd Log: and one more wrong license Revision ChangesPath 1.3 +13 -2 ant/src/script/envset.cmd Index: envset.cmd === RCS file: /home/cvs/ant/src/script/envset.cmd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- envset.cmd14 Apr 2004 15:35:55 - 1.2 +++ envset.cmd14 Apr 2004 15:36:25 - 1.3 @@ -1,7 +1,18 @@ /* -Copyright (c) 2003 The Apache Software Foundation. All rights -reserved. +Copyright 2003-2004 The Apache Software Foundation + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. SET environment variables First optional parameter: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/script ant.cmd antenv.cmd envset.cmd runrc.cmd
bodewig 2004/04/14 08:37:04
Modified:.Tag: ANT_16_BRANCH CONTRIBUTORS WHATSNEW
src/script Tag: ANT_16_BRANCH ant.cmd antenv.cmd envset.cmd
runrc.cmd
Log:
merge
Revision ChangesPath
No revision
No revision
1.1.2.7 +1 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- CONTRIBUTORS 13 Apr 2004 11:40:18 - 1.1.2.6
+++ CONTRIBUTORS 14 Apr 2004 15:37:03 - 1.1.2.7
@@ -190,3 +190,4 @@
Wolfgang Werner
Wolf Siberski
Yohann Roussel
+Zdenek Wagner
1.503.2.67 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.66
retrieving revision 1.503.2.67
diff -u -r1.503.2.66 -r1.503.2.67
--- WHATSNEW 13 Apr 2004 11:40:18 - 1.503.2.66
+++ WHATSNEW 14 Apr 2004 15:37:03 - 1.503.2.67
@@ -63,6 +63,9 @@
transfer and new [local|remote][File|Todir] alternatives to file and
todir that explicitly state the direction of the transfer.
+* The OS/2 wrapper scripts have been adapted to use the new launcher.
+ Bugzilla Report 28226.
+
Changes from Ant 1.6.0 to Ant 1.6.1
===
No revision
No revision
1.1.2.1 +92 -71ant/src/script/ant.cmd
Index: ant.cmd
===
RCS file: /home/cvs/ant/src/script/ant.cmd,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ant.cmd 23 Apr 2003 15:57:43 - 1.1
+++ ant.cmd 14 Apr 2004 15:37:04 - 1.1.2.1
@@ -1,71 +1,92 @@
-/*
-Copyright (c) 2003 The Apache Software Foundation. All rights
-reserved.
-
-Run ant
-*/
-
-parse arg mode envarg '::' antarg
-
-if mode\='.' & mode\='..' & mode\='/' then do
- envarg = mode envarg
- mode = ''
-end
-
-if antarg = '' then do
- antarg = envarg
- envarg = ''
-end
-
-x = setlocal()
-
-env="OS2ENVIRONMENT"
-antenv = _getenv_('antenv')
-if _testenv_() = 0 then do
- interpret 'call "' || antenv || '"' '"' || envarg || '"'
- if _testenv_() = 0 then do
-say 'Ant environment is not set properly'
-x = endlocal()
-exit 16
- end
-end
-
-if mode = '' then mode = _getenv_('ANT_MODE' '..')
-if mode \= '/' then do
- runrc = _getenv_('runrc')
- antrc = _getenv_('antrc' 'antrc.cmd')
- if mode = '..' then mode = '-r'
- else mode = ''
- interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
-end
-
-settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
-
-java = _getenv_('javacmd' 'java')
-opts = value('ANT_OPTS',,env)
-args = value('ANT_ARGS',,env)
-lcp = value('LOCALCLASSPATH',,env)
-if lcp\='' then lcp = '-cp' lcp
-
-java opts lcp 'org.apache.tools.ant.Main' settings args antarg
-
-x = endlocal()
-
-return rc
-
-_testenv_: procedure expose env ANT_HOME JAVA_HOME
-ANT_HOME = value('ANT_HOME',,env)
-if ANT_HOME = '' then return 0
-JAVA_HOME = value('JAVA_HOME',,env)
-if JAVA_HOME = '' then return 0
-cp = translate(value('CLASSPATH',,env))
-if pos(translate(ANT_HOME), cp) = 0 then return 0
-if pos(translate(JAVA_HOME), cp) = 0 then return 0
-return 1
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
+/*
+Copyright 2003-2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing
cvs commit: ant/src/main/org/apache/tools/zip ZipOutputStream.java
bodewig 2004/04/14 08:42:08
Modified:src/main/org/apache/tools/ant AntTypeDefinition.java
ComponentHelper.java PropertyHelper.java
src/main/org/apache/tools/ant/filters EscapeUnicode.java
src/main/org/apache/tools/ant/helper ProjectHelper2.java
src/main/org/apache/tools/ant/taskdefs AbstractCvsTask.java
ExecTask.java PumpStreamHandler.java
Redirector.java SubAnt.java Tar.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet
CSharp.java DotnetCompile.java DotnetDefine.java
DotnetResource.java Ildasm.java ImportTypelib.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb
IPlanetDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/extension
Specification.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp
JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/perforce
P4Labelsync.java
src/main/org/apache/tools/ant/taskdefs/optional/starteam
TreeBasedTask.java
src/main/org/apache/tools/ant/types Assertions.java
Commandline.java CommandlineJava.java
src/main/org/apache/tools/ant/util ClasspathUtils.java
src/main/org/apache/tools/zip ZipOutputStream.java
Log:
-breakiterator fixes by Jack Woehr
Revision ChangesPath
1.13 +1 -1 ant/src/main/org/apache/tools/ant/AntTypeDefinition.java
Index: AntTypeDefinition.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntTypeDefinition.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AntTypeDefinition.java15 Mar 2004 17:33:09 - 1.12
+++ AntTypeDefinition.java14 Apr 2004 15:42:06 - 1.13
@@ -215,7 +215,7 @@
}
/**
- * check if the attributes are correct
+ * Checks if the attributes are correct.
*
* if the class can be created.
* if an adapter class can be created
1.36 +2 -2 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ComponentHelper.java 9 Mar 2004 16:47:59 - 1.35
+++ ComponentHelper.java 14 Apr 2004 15:42:06 - 1.36
@@ -235,9 +235,9 @@
}
/**
- * Initialization code - implementing the original ant component
+ * This method is initialization code implementing the original ant
component
* loading from /org/apache/tools/ant/taskdefs/default.properties
- * and .../types/default.properties
+ * and /org/apache/tools/ant/types/default.properties.
*/
public void initDefaultDefinitions() {
initTasks();
1.15 +3 -3 ant/src/main/org/apache/tools/ant/PropertyHelper.java
Index: PropertyHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/PropertyHelper.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PropertyHelper.java 9 Mar 2004 16:47:59 - 1.14
+++ PropertyHelper.java 14 Apr 2004 15:42:06 - 1.15
@@ -169,9 +169,9 @@
/** Get a property. If all hooks return null, the default
* tables will be used.
*
- * @param ns
- * @param name
- * @return
+ * @param ns namespace of the sought property
+ * @param name name of the sought property
+ * @return The property, if returned by a hook, or null if none.
*/
public Object getPropertyHook(String ns, String name, boolean user) {
if (getNext() != null) {
1.9 +1 -1
ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
Index: EscapeUnicode.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EscapeUnicode.java9 Mar 2004 16:48:02 - 1.8
+++ EscapeUnicode.java14 Apr 2004 15:42:06 - 1.9
@@ -20,7 +20,7 @@
import java.io.Reader;
/**
- * Converts non latin characters to unicode escapes
+ * This method converts non-latin characters to unicode escapes.
* Useful to load properties containing non latin
cvs commit: ant/src/main/org/apache/tools/zip ZipOutputStream.java
bodewig 2004/04/14 08:42:41
Modified:src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
AntTypeDefinition.java ComponentHelper.java
PropertyHelper.java
src/main/org/apache/tools/ant/filters Tag: ANT_16_BRANCH
EscapeUnicode.java
src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH
ProjectHelper2.java
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
AbstractCvsTask.java ExecTask.java SubAnt.java
Tar.java
src/main/org/apache/tools/ant/taskdefs/optional/dotnet Tag:
ANT_16_BRANCH CSharp.java DotnetCompile.java
DotnetDefine.java DotnetResource.java Ildasm.java
ImportTypelib.java
src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
ANT_16_BRANCH IPlanetDeploymentTool.java
src/main/org/apache/tools/ant/taskdefs/optional/extension
Tag: ANT_16_BRANCH Specification.java
src/main/org/apache/tools/ant/taskdefs/optional/jsp Tag:
ANT_16_BRANCH JspC.java
src/main/org/apache/tools/ant/taskdefs/optional/perforce
Tag: ANT_16_BRANCH P4Labelsync.java
src/main/org/apache/tools/ant/taskdefs/optional/starteam
Tag: ANT_16_BRANCH TreeBasedTask.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
Assertions.java Commandline.java
CommandlineJava.java
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
ClasspathUtils.java
src/main/org/apache/tools/zip Tag: ANT_16_BRANCH
ZipOutputStream.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.7.2.6 +1 -1 ant/src/main/org/apache/tools/ant/AntTypeDefinition.java
Index: AntTypeDefinition.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntTypeDefinition.java,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- AntTypeDefinition.java15 Mar 2004 17:33:24 - 1.7.2.5
+++ AntTypeDefinition.java14 Apr 2004 15:42:40 - 1.7.2.6
@@ -215,7 +215,7 @@
}
/**
- * check if the attributes are correct
+ * Checks if the attributes are correct.
*
* if the class can be created.
* if an adapter class can be created
1.28.2.7 +2 -2 ant/src/main/org/apache/tools/ant/ComponentHelper.java
Index: ComponentHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ComponentHelper.java,v
retrieving revision 1.28.2.6
retrieving revision 1.28.2.7
diff -u -r1.28.2.6 -r1.28.2.7
--- ComponentHelper.java 9 Mar 2004 17:01:29 - 1.28.2.6
+++ ComponentHelper.java 14 Apr 2004 15:42:40 - 1.28.2.7
@@ -235,9 +235,9 @@
}
/**
- * Initialization code - implementing the original ant component
+ * This method is initialization code implementing the original ant
component
* loading from /org/apache/tools/ant/taskdefs/default.properties
- * and .../types/default.properties
+ * and /org/apache/tools/ant/types/default.properties.
*/
public void initDefaultDefinitions() {
initTasks();
1.9.2.6 +3 -3 ant/src/main/org/apache/tools/ant/PropertyHelper.java
Index: PropertyHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/PropertyHelper.java,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- PropertyHelper.java 9 Mar 2004 17:01:29 - 1.9.2.5
+++ PropertyHelper.java 14 Apr 2004 15:42:40 - 1.9.2.6
@@ -169,9 +169,9 @@
/** Get a property. If all hooks return null, the default
* tables will be used.
*
- * @param ns
- * @param name
- * @return
+ * @param ns namespace of the sought property
+ * @param name name of the sought property
+ * @return The property, if returned by a hook, or null if none.
*/
public Object getPropertyHook(String ns, String name, boolean user) {
if (getNext() != null) {
No revision
No revision
1.4.2.5 +1 -1
ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
Index: EscapeUnicode.java
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh SSHExec.java
bodewig 2004/04/14 09:13:27
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/ssh
SSHExec.java
Log:
Capture stderr in , PR 28349
Revision ChangesPath
1.585 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- WHATSNEW 14 Apr 2004 15:33:31 - 1.584
+++ WHATSNEW 14 Apr 2004 16:13:26 - 1.585
@@ -136,6 +136,8 @@
* The OS/2 wrapper scripts have been adapted to use the new launcher.
Bugzilla Report 28226.
+* now also captures stderr output. Bugzilla Report 28349.
+
Changes from Ant 1.6.0 to Ant 1.6.1
=
1.16 +2 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Index: SSHExec.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SSHExec.java 9 Mar 2004 16:48:37 - 1.15
+++ SSHExec.java 14 Apr 2004 16:13:27 - 1.16
@@ -145,6 +145,7 @@
final ChannelExec channel = (ChannelExec)
session.openChannel("exec");
channel.setCommand(command);
channel.setOutputStream(tee);
+channel.setExtOutputStream(tee);
channel.connect();
// wait for it to finish
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh SSHExec.java
bodewig 2004/04/14 09:13:43
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/ssh Tag:
ANT_16_BRANCH SSHExec.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.68 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.67
retrieving revision 1.503.2.68
diff -u -r1.503.2.67 -r1.503.2.68
--- WHATSNEW 14 Apr 2004 15:37:03 - 1.503.2.67
+++ WHATSNEW 14 Apr 2004 16:13:43 - 1.503.2.68
@@ -66,6 +66,8 @@
* The OS/2 wrapper scripts have been adapted to use the new launcher.
Bugzilla Report 28226.
+* now also captures stderr output. Bugzilla Report 28349.
+
Changes from Ant 1.6.0 to Ant 1.6.1
===
No revision
No revision
1.9.2.7 +2 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java
Index: SSHExec.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.java,v
retrieving revision 1.9.2.6
retrieving revision 1.9.2.7
diff -u -r1.9.2.6 -r1.9.2.7
--- SSHExec.java 9 Mar 2004 17:01:53 - 1.9.2.6
+++ SSHExec.java 14 Apr 2004 16:13:43 - 1.9.2.7
@@ -145,6 +145,7 @@
final ChannelExec channel = (ChannelExec)
session.openChannel("exec");
channel.setCommand(command);
channel.setOutputStream(tee);
+channel.setExtOutputStream(tee);
channel.connect();
// wait for it to finish
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit FormatterElement.java JUnitTask.java JUnitTestRunner.java
bodewig 2004/04/15 06:53:47
Modified:.CONTRIBUTORS build.xml
src/main/org/apache/tools/ant/taskdefs/optional/junit
FormatterElement.java JUnitTask.java
JUnitTestRunner.java
Log:
Add forkStyle attribute to with possible values of once,
perTest and perBatch.
once will create a single Java VM for all forked tests, perTest is
what we have traditionally (and the default), perBatch uses a VM per
.
Actually, this is not entirely true since only tests with the same
configuration of filtetrace and haltonfailure and friends can run
inside the same VM, so we may end up with mutliple VMs anyway - but
once really should be a lot faster than perTest in general.
Based on
PR: 24697
Submitted by: Anton
Revision ChangesPath
1.13 +2 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CONTRIBUTORS 14 Apr 2004 15:33:31 - 1.12
+++ CONTRIBUTORS 15 Apr 2004 13:53:47 - 1.13
@@ -63,6 +63,7 @@
Glenn Twiggs
Greg Nelson
Harish Prabandham
+Haroon Rafique
Hiroaki Nakamura
Holger Engels
Ingenonsya France
@@ -165,6 +166,7 @@
Russell Gold
Sam Ruby
Scott Carlson
+Scott M. Stirling
Sean Egan
Sean P. Kane
Shiraz Kanga
1.416 +2 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- build.xml 26 Mar 2004 13:08:11 - 1.415
+++ build.xml 15 Apr 2004 13:53:47 - 1.416
@@ -53,6 +53,7 @@
+
1.22 +17 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
Index: FormatterElement.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FormatterElement.java 9 Mar 2004 16:48:31 - 1.21
+++ FormatterElement.java 15 Apr 2004 13:53:47 - 1.22
@@ -56,6 +56,13 @@
private String ifProperty;
private String unlessProperty;
+public static final String XML_FORMATTER_CLASS_NAME =
+
"org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter";
+public static final String BRIEF_FORMATTER_CLASS_NAME =
+
"org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter";
+public static final String PLAIN_FORMATTER_CLASS_NAME =
+
"org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter";
+
/**
* Quick way to use a standard formatter.
*
@@ -71,15 +78,13 @@
*/
public void setType(TypeAttribute type) {
if ("xml".equals(type.getValue())) {
-
setClassname("org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter");
-setExtension(".xml");
+setClassname(XML_FORMATTER_CLASS_NAME);
} else {
if ("brief".equals(type.getValue())) {
-
setClassname("org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter");
+setClassname(BRIEF_FORMATTER_CLASS_NAME);
} else { // must be plain, ensured by TypeAttribute
-
setClassname("org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter");
+setClassname(PLAIN_FORMATTER_CLASS_NAME);
}
-setExtension(".txt");
}
}
@@ -90,6 +95,13 @@
*/
public void setClassname(String classname) {
this.classname = classname;
+if (XML_FORMATTER_CLASS_NAME.equals(classname)) {
+ setExtension(".xml");
+} else if (PLAIN_FORMATTER_CLASS_NAME.equals(classname)) {
+ setExtension(".txt");
+} else if (BRIEF_FORMATTER_CLASS_NAME.equals(classname)) {
+ setExtension(".txt");
+}
}
/**
1.95 +269 -33
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- JUnitTask.java9 Ma
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit FormatterElement.java JUnitTask.java JUnitTestRunner.java
bodewig 2004/04/16 00:05:32
Modified:.Tag: ANT_16_BRANCH CONTRIBUTORS build.xml
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH FormatterElement.java JUnitTask.java
JUnitTestRunner.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.1.2.8 +2 -0 ant/CONTRIBUTORS
Index: CONTRIBUTORS
===
RCS file: /home/cvs/ant/CONTRIBUTORS,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- CONTRIBUTORS 14 Apr 2004 15:37:03 - 1.1.2.7
+++ CONTRIBUTORS 16 Apr 2004 07:05:32 - 1.1.2.8
@@ -62,6 +62,7 @@
Glenn Twiggs
Greg Nelson
Harish Prabandham
+Haroon Rafique
Hiroaki Nakamura
Holger Engels
Ingenonsya France
@@ -163,6 +164,7 @@
Russell Gold
Sam Ruby
Scott Carlson
+Scott M. Stirling
Sean Egan
Sean P. Kane
Shiraz Kanga
1.392.2.24 +2 -1 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.23
retrieving revision 1.392.2.24
diff -u -r1.392.2.23 -r1.392.2.24
--- build.xml 26 Mar 2004 13:08:29 - 1.392.2.23
+++ build.xml 16 Apr 2004 07:05:32 - 1.392.2.24
@@ -53,6 +53,7 @@
+
No revision
No revision
1.17.2.5 +17 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java
Index: FormatterElement.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.java,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -r1.17.2.4 -r1.17.2.5
--- FormatterElement.java 9 Mar 2004 17:01:49 - 1.17.2.4
+++ FormatterElement.java 16 Apr 2004 07:05:32 - 1.17.2.5
@@ -56,6 +56,13 @@
private String ifProperty;
private String unlessProperty;
+public static final String XML_FORMATTER_CLASS_NAME =
+
"org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter";
+public static final String BRIEF_FORMATTER_CLASS_NAME =
+
"org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter";
+public static final String PLAIN_FORMATTER_CLASS_NAME =
+
"org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter";
+
/**
* Quick way to use a standard formatter.
*
@@ -71,15 +78,13 @@
*/
public void setType(TypeAttribute type) {
if ("xml".equals(type.getValue())) {
-
setClassname("org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter");
-setExtension(".xml");
+setClassname(XML_FORMATTER_CLASS_NAME);
} else {
if ("brief".equals(type.getValue())) {
-
setClassname("org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter");
+setClassname(BRIEF_FORMATTER_CLASS_NAME);
} else { // must be plain, ensured by TypeAttribute
-
setClassname("org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter");
+setClassname(PLAIN_FORMATTER_CLASS_NAME);
}
-setExtension(".txt");
}
}
@@ -90,6 +95,13 @@
*/
public void setClassname(String classname) {
this.classname = classname;
+if (XML_FORMATTER_CLASS_NAME.equals(classname)) {
+ setExtension(".xml");
+} else if (PLAIN_FORMATTER_CLASS_NAME.equals(classname)) {
+ setExtension(".txt");
+} else if (BRIEF_FORMATTER_CLASS_NAME.equals(classname)) {
+ setExtension(".txt");
+}
}
/**
1.83.2.10 +295 -49
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.83.2.9
retrieving revision 1.83.2.10
diff -u -r1.83.2.9 -r1.83.2.10
--- JUnitTask.java9 Mar 2004 17:01:50 - 1.83.2.9
+++ JUnitTask.java16 Apr 2004 07:05:32 - 1.83.2.10
@@ -17,12 +17,21 @@
package org.apache.tools.ant.taskdefs.optional.junit;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
+
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
bodewig 2004/04/16 00:06:36
Modified:src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
Log:
Merged the subclass-friendly version into 1.6 branch
Revision ChangesPath
1.96 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- JUnitTask.java15 Apr 2004 13:53:47 - 1.95
+++ JUnitTask.java16 Apr 2004 07:06:36 - 1.96
@@ -1271,7 +1271,7 @@
}
/**
- * @since Ant 1.7
+ * @since Ant 1.6.2
*/
protected CommandlineJava getCommandline() {
if (commandline == null) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
bodewig 2004/04/16 00:48:49
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
Log:
Set context classloader in , PR: 24802
Revision ChangesPath
1.586 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- WHATSNEW 14 Apr 2004 16:13:26 - 1.585
+++ WHATSNEW 16 Apr 2004 07:48:49 - 1.586
@@ -113,6 +113,9 @@
* and
behaved identically.
+* now sets the context classloader if you've specified a nested
+ . Bugzilla report 24802.
+
Other changes:
--
1.83 +21 -3
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- XSLTProcess.java 9 Mar 2004 16:48:07 - 1.82
+++ XSLTProcess.java 16 Apr 2004 07:48:49 - 1.83
@@ -121,6 +121,18 @@
private boolean reuseLoadedStylesheet = true;
/**
+ * AntClassLoader for the nested <classpath> - if set.
+ *
+ * We keep this here in order to reset the context classloader
+ * in execute. We can't use liaison.getClass().getClassLoader()
+ * since the actual liaison class may have been loaded by a loader
+ * higher up (system classloader, for example).
+ *
+ * @since Ant 1.6.2
+ */
+private AntClassLoader loader = null;
+
+/**
* Creates a new XSLTProcess Task.
*/
public XSLTProcess() {
@@ -170,6 +182,7 @@
if (inFile != null && !inFile.exists()) {
throw new BuildException("input file " + inFile.toString() + "
does not exist", getLocation());
}
+
try {
if (baseDir == null) {
baseDir = getProject().resolveFile(".");
@@ -233,6 +246,10 @@
}
}
} finally {
+if (loader != null) {
+loader.resetThreadContextLoader();
+loader = null;
+}
liaison = null;
stylesheetLoaded = false;
baseDir = savedBaseDir;
@@ -379,8 +396,9 @@
if (classpath == null) {
return Class.forName(classname);
} else {
-AntClassLoader al = getProject().createClassLoader(classpath);
-Class c = Class.forName(classname, true, al);
+loader = getProject().createClassLoader(classpath);
+loader.setThreadContextLoader();
+Class c = Class.forName(classname, true, loader);
return c;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
bodewig 2004/04/16 00:49:42
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
XSLTProcess.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.69 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.68
retrieving revision 1.503.2.69
diff -u -r1.503.2.68 -r1.503.2.69
--- WHATSNEW 14 Apr 2004 16:13:43 - 1.503.2.68
+++ WHATSNEW 16 Apr 2004 07:49:42 - 1.503.2.69
@@ -43,6 +43,9 @@
the -C switch to gcj. This means you can now compile to native code
with gcj which has been impossible in Ant < 1.6.2.
+* now sets the context classloader if you've specified a nested
+ . Bugzilla report 24802.
+
Other changes:
--
No revision
No revision
1.78.2.5 +21 -3
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.78.2.4
retrieving revision 1.78.2.5
diff -u -r1.78.2.4 -r1.78.2.5
--- XSLTProcess.java 9 Mar 2004 17:01:34 - 1.78.2.4
+++ XSLTProcess.java 16 Apr 2004 07:49:42 - 1.78.2.5
@@ -121,6 +121,18 @@
private boolean reuseLoadedStylesheet = true;
/**
+ * AntClassLoader for the nested <classpath> - if set.
+ *
+ * We keep this here in order to reset the context classloader
+ * in execute. We can't use liaison.getClass().getClassLoader()
+ * since the actual liaison class may have been loaded by a loader
+ * higher up (system classloader, for example).
+ *
+ * @since Ant 1.6.2
+ */
+private AntClassLoader loader = null;
+
+/**
* Creates a new XSLTProcess Task.
*/
public XSLTProcess() {
@@ -170,6 +182,7 @@
if (inFile != null && !inFile.exists()) {
throw new BuildException("input file " + inFile.toString() + "
does not exist", getLocation());
}
+
try {
if (baseDir == null) {
baseDir = getProject().resolveFile(".");
@@ -233,6 +246,10 @@
}
}
} finally {
+if (loader != null) {
+loader.resetThreadContextLoader();
+loader = null;
+}
liaison = null;
stylesheetLoaded = false;
baseDir = savedBaseDir;
@@ -379,8 +396,9 @@
if (classpath == null) {
return Class.forName(classname);
} else {
-AntClassLoader al = getProject().createClassLoader(classpath);
-Class c = Class.forName(classname, true, al);
+loader = getProject().createClassLoader(classpath);
+loader.setThreadContextLoader();
+Class c = Class.forName(classname, true, loader);
return c;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs StyleTest.java
bodewig 2004/04/16 01:36:01
Modified:.WHATSNEW
docs/manual/CoreTasks style.html
src/etc/testcases/taskdefs/style build.xml
src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
src/testcases/org/apache/tools/ant/taskdefs StyleTest.java
Log:
Add nested mappers to xslt, PR: 11249
Revision ChangesPath
1.587 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- WHATSNEW 16 Apr 2004 07:48:49 - 1.586
+++ WHATSNEW 16 Apr 2004 08:36:00 - 1.587
@@ -141,6 +141,8 @@
* now also captures stderr output. Bugzilla Report 28349.
+* now supports a nested . Bugzilla Report 11249.
+
Changes from Ant 1.6.0 to Ant 1.6.1
=
1.32 +19 -1 ant/docs/manual/CoreTasks/style.html
Index: style.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/style.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- style.html9 Feb 2004 21:50:05 - 1.31
+++ style.html16 Apr 2004 08:36:01 - 1.32
@@ -56,7 +56,8 @@
extension
desired file extension to be used for the targets. If
not
- specified, the default is ".html".
+ specified, the default is ".html". Will be ignored if
+ a nested <mapper> has been specified.
No
@@ -288,6 +289,16 @@
+mapper
+
+since Ant 1.6.2
+
+You can define filename transformations by using a nested mapper element. The default mapper
+used by <xslt> removes the file extension from the
+source file and adds the extension specified via the extension
+attribute.
+
Examples
@@ -334,6 +345,13 @@
<attribute
name="http://xml.apache.org/xalan/features/optimize";
value="true"/>
</factory>
</xslt>
+
+ Using a mapper
+<xslt basedir="in" destdir="out"
+ style="style/apache.xsl">
+ <mapper type="glob" from="*.xml.en"
to="*.html.en"/>
+</xslt>
+
Copyright © 2000-2004 The Apache Software Foundation.
All rights
1.4 +15 -0 ant/src/etc/testcases/taskdefs/style/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/style/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 12 Sep 2003 13:59:35 - 1.3
+++ build.xml 16 Apr 2004 08:36:01 - 1.4
@@ -42,6 +42,21 @@
+
+
+
+ <param name="set" expression="${value}"/>
+
+
+
+
+
+
+ <param name="set" expression="${value}"/>
+ <mapper type="glob" from="data.*" to="out.*"/>
+
+
+
1.84 +64 -7
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- XSLTProcess.java 16 Apr 2004 07:48:49 - 1.83
+++ XSLTProcess.java 16 Apr 2004 08:36:01 - 1.84
@@ -25,9 +25,11 @@
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.DynamicConfigurator;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Mapper;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
import org.apache.tools.ant.types.XMLCatalog;
+import org.apache.tools.ant.util.FileNameMapper;
import org.apache.tools.ant.util.FileUtils;
/**
@@ -133,6 +135,13 @@
private AntClassLoader loader = null;
/**
+ * Mapper to use when a set of files gets processed.
+ *
+ * @since Ant 1.6.2
+ */
+private Mapper mapperElement = null;
+
+/**
* Creates a new XSLTProcess Task.
*/
public XSLTProcess() {
@@ -163,6 +172,21 @@
}
/**
+ * Defines the mapper to map source to destination files.
+ * @return a mapper to be configured
+ * @exception BuildException if more than one mapper is defined
+ * @since Ant 1.6.2
+ */
+public Mapper createMapper() throws BuildException {
+if (mapper
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs StyleTest.java
bodewig 2004/04/16 01:36:46
Modified:.Tag: ANT_16_BRANCH WHATSNEW
docs/manual/CoreTasks Tag: ANT_16_BRANCH style.html
src/etc/testcases/taskdefs/style Tag: ANT_16_BRANCH
build.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
XSLTProcess.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH StyleTest.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.70 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.69
retrieving revision 1.503.2.70
diff -u -r1.503.2.69 -r1.503.2.70
--- WHATSNEW 16 Apr 2004 07:49:42 - 1.503.2.69
+++ WHATSNEW 16 Apr 2004 08:36:46 - 1.503.2.70
@@ -71,6 +71,8 @@
* now also captures stderr output. Bugzilla Report 28349.
+* now supports a nested . Bugzilla Report 11249.
+
Changes from Ant 1.6.0 to Ant 1.6.1
===
No revision
No revision
1.29.2.4 +19 -1 ant/docs/manual/CoreTasks/style.html
Index: style.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/style.html,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -r1.29.2.3 -r1.29.2.4
--- style.html9 Feb 2004 22:12:07 - 1.29.2.3
+++ style.html16 Apr 2004 08:36:46 - 1.29.2.4
@@ -57,7 +57,8 @@
extension
desired file extension to be used for the targets. If
not
- specified, the default is ".html".
+ specified, the default is ".html". Will be ignored if
+ a nested <mapper> has been specified.
No
@@ -289,6 +290,16 @@
+mapper
+
+since Ant 1.6.2
+
+You can define filename transformations by using a nested mapper element. The default mapper
+used by <xslt> removes the file extension from the
+source file and adds the extension specified via the extension
+attribute.
+
Examples
@@ -335,6 +346,13 @@
<attribute
name="http://xml.apache.org/xalan/features/optimize";
value="true"/>
</factory>
</xslt>
+
+ Using a mapper
+<xslt basedir="in" destdir="out"
+ style="style/apache.xsl">
+ <mapper type="glob" from="*.xml.en"
to="*.html.en"/>
+</xslt>
+
Copyright © 2000-2004 The Apache Software Foundation.
All rights
No revision
No revision
1.3.2.1 +15 -0 ant/src/etc/testcases/taskdefs/style/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/style/build.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- build.xml 12 Sep 2003 13:59:35 - 1.3
+++ build.xml 16 Apr 2004 08:36:46 - 1.3.2.1
@@ -42,6 +42,21 @@
+
+
+
+ <param name="set" expression="${value}"/>
+
+
+
+
+
+
+ <param name="set" expression="${value}"/>
+ <mapper type="glob" from="data.*" to="out.*"/>
+
+
+
No revision
No revision
1.78.2.6 +64 -7
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.78.2.5
retrieving revision 1.78.2.6
diff -u -r1.78.2.5 -r1.78.2.6
--- XSLTProcess.java 16 Apr 2004 07:49:42 - 1.78.2.5
+++ XSLTProcess.java 16 Apr 2004 08:36:46 - 1.78.2.6
@@ -25,9 +25,11 @@
import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.DynamicConfigurator;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Mapper;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
import org.apache.tools.ant.types.XMLCatalog;
+import org.apache.tools.ant.util.FileNameMapper;
import org.apache.tools.ant.util.FileUtils;
/**
@@ -133,6 +135,13 @@
private AntClassLoader loader = null;
/**
+ * Mapper to use when a set of files gets processed.
+ *
+ * @since Ant 1.6.2
+ */
+private M
cvs commit: ant/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/util - New directory
bodewig 2004/04/16 01:57:44 ant/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/util - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/proposal/sandbox/dotnet/docs dotnetexec.html index.html msbuild.html nant.html
bodewig 2004/04/16 02:12:44 Modified:proposal/sandbox/dotnet README proposal/sandbox/dotnet/docs dotnetexec.html index.html msbuild.html nant.html Log: Some doc tweaks and a new goal Revision ChangesPath 1.2 +2 -0 ant/proposal/sandbox/dotnet/README Index: README === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- README21 Nov 2003 10:52:22 - 1.1 +++ README16 Apr 2004 09:12:43 - 1.2 @@ -30,6 +30,8 @@ * A task - if only for the fun of having it. +* A task. + Mid term goals: * A task. 1.2 +1 -1 ant/proposal/sandbox/dotnet/docs/dotnetexec.html Index: dotnetexec.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/dotnetexec.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dotnetexec.html 28 Nov 2003 11:39:44 - 1.1 +++ dotnetexec.html 16 Apr 2004 09:12:43 - 1.2 @@ -27,6 +27,6 @@ href="http://www.go-mono.org/faq.html#q86";>Mono FAQ. - Copyright © 2003 Apache Software Foundation. All rights Reserved. + Copyright © 2003-2004 The Apache Software Foundation. All rights Reserved. 1.2 +1 -1 ant/proposal/sandbox/dotnet/docs/index.html Index: index.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html28 Nov 2003 11:39:44 - 1.1 +++ index.html16 Apr 2004 09:12:43 - 1.2 @@ -114,6 +114,6 @@ - Copyright © 2003 Apache Software Foundation. All rights Reserved. + Copyright © 2003-2004 The Apache Software Foundation. All rights Reserved. 1.2 +2 -2 ant/proposal/sandbox/dotnet/docs/msbuild.html Index: msbuild.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/msbuild.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- msbuild.html 28 Nov 2003 11:39:44 - 1.1 +++ msbuild.html 16 Apr 2004 09:12:43 - 1.2 @@ -63,7 +63,7 @@ Let MSBuild search for a *.proj file in the (Ant) project's base directory and execute the default target in it: -<msbuild/> +<msbuild/> Let MSBuild execute the targets named foo and bar in the build file msbuild.proj in Ant's basedir and pass the property @@ -105,6 +105,6 @@ - Copyright © 2003 Apache Software Foundation. All rights Reserved. + Copyright © 2003-2004 The Apache Software Foundation. All rights Reserved. 1.2 +2 -2 ant/proposal/sandbox/dotnet/docs/nant.html Index: nant.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/nant.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nant.html 28 Nov 2003 11:39:44 - 1.1 +++ nant.html 16 Apr 2004 09:12:43 - 1.2 @@ -61,7 +61,7 @@ Let NAnt search for a *.build file in the (Ant) project's base directory and execute the default target in it: -<nant/> +<nant/> Let NAnt execute the targets named foo and bar in the build file nant.build in Ant's basedir and pass the property @@ -103,6 +103,6 @@ - Copyright © 2003 Apache Software Foundation. All rights Reserved. + Copyright © 2003-2004 The Apache Software Foundation. All rights Reserved. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/proposal/sandbox/dotnet/src/testcases/org/apache/tools/ant/taskdefs/optional/dotnet DotNetExecTaskTest.java MSBuildTaskTest.java NAntTaskTest.java
bodewig 2004/04/16 02:15:32 Added: proposal/sandbox/dotnet Tag: ANT_16_BRANCH .cvsignore README build.xml proposal/sandbox/dotnet/docs Tag: ANT_16_BRANCH dotnetexec.html index.html msbuild.html nant.html proposal/sandbox/dotnet/src/etc/testcases Tag: ANT_16_BRANCH dotnetexec.xml msbuild.xml nant.xml proposal/sandbox/dotnet/src/etc/testcases/src Tag: ANT_16_BRANCH example.cs example2.cs msbuild.proj nant.build proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet Tag: ANT_16_BRANCH AbstractBuildTask.java DotNetExecTask.java MSBuildTask.java NAntTask.java antlib.xml proposal/sandbox/dotnet/src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH XMLFragment.java proposal/sandbox/dotnet/src/testcases/org/apache/tools/ant/taskdefs/optional/dotnet Tag: ANT_16_BRANCH DotNetExecTaskTest.java MSBuildTaskTest.java NAntTaskTest.java Log: An Ant 1.6.x ready version, basically 1.7's XMLFragment has been merged into the antlib Revision ChangesPath No revision No revision 1.1.2.1 +0 -0 ant/proposal/sandbox/dotnet/.cvsignore Index: .cvsignore === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/.cvsignore,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 1.2.2.1 +2 -2 ant/proposal/sandbox/dotnet/README Index: README === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/README,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- README16 Apr 2004 09:12:43 - 1.2 +++ README16 Apr 2004 09:15:31 - 1.2.2.1 @@ -30,9 +30,9 @@ * A task - if only for the fun of having it. -* A task. - Mid term goals: + +* A task. * A task. 1.2.2.1 +0 -0 ant/proposal/sandbox/dotnet/build.xml Index: build.xml === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/build.xml,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 No revision No revision 1.2.2.1 +0 -0 ant/proposal/sandbox/dotnet/docs/dotnetexec.html Index: dotnetexec.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/dotnetexec.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 1.2.2.1 +2 -5 ant/proposal/sandbox/dotnet/docs/index.html Index: index.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/index.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- index.html16 Apr 2004 09:12:43 - 1.2 +++ index.html16 Apr 2004 09:15:31 - 1.2.2.1 @@ -14,11 +14,8 @@ Requirements -The current version will only work for a CVS build of Ant -created from CVS HEAD (i.e. after Ant 1.6's feature freeze) of -2003-11-27 or later. A version that can work with Ant 1.6 may be -provided at a later stage. This task library is never going to -work with Ant < 1.6. +http://ant.apache.org/bindownload.cgi";>Ant 1.6.x +is required. Installation 1.2.2.1 +6 -0 ant/proposal/sandbox/dotnet/docs/msbuild.html Index: msbuild.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/msbuild.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -r1.2 -r1.2.2.1 --- msbuild.html 16 Apr 2004 09:12:43 - 1.2 +++ msbuild.html 16 Apr 2004 09:15:31 - 1.2.2.1 @@ -58,6 +58,12 @@ a build file snippet instead and Ant will wrap the necessary MSBuild <Project> around it. +Note: Ant will turn all element and attribute names into +lower case characters, this means that nested build-file snippets +are currently useless since MSBuild seems to be case-sensitive and +the important elements like <Target> and <Task> start +with a capital T. + Examples Let MSBuild search for a *.proj file in the (Ant) project's base 1.2.2.1 +4 -0 ant/proposal/sandbox
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2004/04/16 02:35:21
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs Zip.java
Log:
Don't delete existing file when trying to update a read-only archive, PR:
28419
Revision ChangesPath
1.588 +4 -1 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- WHATSNEW 16 Apr 2004 08:36:00 - 1.587
+++ WHATSNEW 16 Apr 2004 09:35:21 - 1.588
@@ -114,7 +114,10 @@
behaved identically.
* now sets the context classloader if you've specified a nested
- . Bugzilla report 24802.
+ . Bugzilla Report 24802.
+
+* and friends would delete the original file when trying to update
+ a read-only archive. Bugzilla Report 28419.
Other changes:
--
1.124 +8 -0 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- Zip.java 9 Mar 2004 16:48:07 - 1.123
+++ Zip.java 16 Apr 2004 09:35:21 - 1.124
@@ -338,6 +338,14 @@
+ archiveType + " file to create!");
}
+if (zipFile.exists() && !zipFile.isFile()) {
+throw new BuildException(zipFile + " is not a file.");
+}
+
+if (zipFile.exists() && !zipFile.canWrite()) {
+throw new BuildException(zipFile + " is read-only.");
+}
+
// Renamed version of original file, if it exists
File renamedFile = null;
// Whether or not an actual update is required -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2004/04/16 02:36:00
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Zip.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.71 +4 -1 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.70
retrieving revision 1.503.2.71
diff -u -r1.503.2.70 -r1.503.2.71
--- WHATSNEW 16 Apr 2004 08:36:46 - 1.503.2.70
+++ WHATSNEW 16 Apr 2004 09:35:59 - 1.503.2.71
@@ -44,7 +44,10 @@
with gcj which has been impossible in Ant < 1.6.2.
* now sets the context classloader if you've specified a nested
- . Bugzilla report 24802.
+ . Bugzilla Report 24802.
+
+* and friends would delete the original file when trying to update
+ a read-only archive. Bugzilla Report 28419.
Other changes:
--
No revision
No revision
1.116.2.7 +8 -0 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.116.2.6
retrieving revision 1.116.2.7
diff -u -r1.116.2.6 -r1.116.2.7
--- Zip.java 9 Mar 2004 17:01:34 - 1.116.2.6
+++ Zip.java 16 Apr 2004 09:35:59 - 1.116.2.7
@@ -312,6 +312,14 @@
+ archiveType + " file to create!");
}
+if (zipFile.exists() && !zipFile.isFile()) {
+throw new BuildException(zipFile + " is not a file.");
+}
+
+if (zipFile.exists() && !zipFile.canWrite()) {
+throw new BuildException(zipFile + " is read-only.");
+}
+
// Renamed version of original file, if it exists
File renamedFile = null;
// Whether or not an actual update is required -
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
bodewig 2004/04/16 02:59:03
Modified:src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
Log:
Use addMapper instead pf createMapper as suggested by Peter
Revision ChangesPath
1.85 +3 -5
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- XSLTProcess.java 16 Apr 2004 08:36:01 - 1.84
+++ XSLTProcess.java 16 Apr 2004 09:59:02 - 1.85
@@ -173,17 +173,15 @@
/**
* Defines the mapper to map source to destination files.
- * @return a mapper to be configured
* @exception BuildException if more than one mapper is defined
* @since Ant 1.6.2
*/
-public Mapper createMapper() throws BuildException {
+public void addMapper(Mapper mapper) {
if (mapperElement != null) {
throw new BuildException("Cannot define more than one mapper",
getLocation());
}
-mapperElement = new Mapper(getProject());
-return mapperElement;
+mapperElement = mapper;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs XSLTProcess.java
bodewig 2004/04/16 02:59:25
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
XSLTProcess.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.78.2.7 +3 -5
ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java
Index: XSLTProcess.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java,v
retrieving revision 1.78.2.6
retrieving revision 1.78.2.7
diff -u -r1.78.2.6 -r1.78.2.7
--- XSLTProcess.java 16 Apr 2004 08:36:46 - 1.78.2.6
+++ XSLTProcess.java 16 Apr 2004 09:59:24 - 1.78.2.7
@@ -173,17 +173,15 @@
/**
* Defines the mapper to map source to destination files.
- * @return a mapper to be configured
* @exception BuildException if more than one mapper is defined
* @since Ant 1.6.2
*/
-public Mapper createMapper() throws BuildException {
+public void addMapper(Mapper mapper) {
if (mapperElement != null) {
throw new BuildException("Cannot define more than one mapper",
getLocation());
}
-mapperElement = new Mapper(getProject());
-return mapperElement;
+mapperElement = mapper;
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet WixTask.java antlib.xml
bodewig 2004/04/16 07:17:58 Modified:proposal/sandbox/dotnet/docs index.html proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet antlib.xml Added: proposal/sandbox/dotnet/docs wix.html proposal/sandbox/dotnet/src/main/org/apache/tools/ant/taskdefs/optional/dotnet WixTask.java Log: very experimental WiX task Revision ChangesPath 1.3 +2 -0 ant/proposal/sandbox/dotnet/docs/index.html Index: index.html === RCS file: /home/cvs/ant/proposal/sandbox/dotnet/docs/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- index.html16 Apr 2004 09:12:43 - 1.2 +++ index.html16 Apr 2004 14:17:58 - 1.3 @@ -111,6 +111,8 @@ msbuild - execute the MSBuild build tool, untested. + + wix - execute the WiX toolset, untested. 1.1 ant/proposal/sandbox/dotnet/docs/wix.html Index: wix.html === Wix Task Wix Description Runs the candle, light or both from the http://sourceforge.net/projects/wix";>Wix toolset. Parameters Attribute Description Required source The single source file to process. Either this or at least one nested <sources> set. target The expected target file. Yes, unless you run candle without light. mode Which part of the toolset to run, one of "candle", "light" or "both". No, default is "both". vm Same as dotnetexec's vm attribute. Specify the framework to use. No. Parameters specified as nested elements sources Specify source files that shall be passed on the command line. This is a http://ant.apache.org/manual/CoreTypes/fileset.html";>fileset. moresources Specify source files that shall not be passed on the command line. This is a http://ant.apache.org/manual/CoreTypes/fileset.html";>fileset. Typically this would list include files when running candle or the files that vecome part of the MSI file when running light. The files in this set are only used for timestamp comparisons. If neither these files nor the given "normal" sources are newer than the expected target, the task won't do anything. Examples Create product.wixobj from product.wxs: <wix mode="candle" source="product.wxs"/> The same but using a nested sources element: <wix mode="candle"> <sources dir="."> <include name="product.wxs"/> </sources> </wix> Create product.msi from product.wixobj: <wix mode="light" source="product.wixobj" target="product.msi"/> Combine the examples into a single step: <wix source="product.wxs" target="product.msi"/> Note that the task wouldn't do anything if product.wxs was older than product.wixobj and product.wixobj was older than product.msi. Compile multiple .wxs files at once: <wix mode="candle"> <sources dir="."> <include name="*.wxs"/> </sources> </wix> Compile multiple .wxs files at once, specify some include files in addition to that: <wix mode="candle"> <sources dir="."> <include name="*.wxs"/> </sources> <moresources dir="."> <include name="*.wxi"/> </moresources> </wix> Link multiple .wixobj files at once: <wix mode="light" target="product.msi"> <sources dir="."> <include name="*.wixobj"/> </sources> </wix> Link multiple .wixobj files at once and specify that the files in directory "source" will become part of the package: <wix mode="light&qu
cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java
bodewig 2004/04/19 23:24:25
Modified:.WHATSNEW
src/main/org/apache/tools/ant/types Assertions.java
CommandlineJava.java
src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
Log:
inside or didn't work, PR: 27218
Revision ChangesPath
1.589 +2 -2 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.588
retrieving revision 1.589
diff -u -r1.588 -r1.589
--- WHATSNEW 16 Apr 2004 09:35:21 - 1.588
+++ WHATSNEW 20 Apr 2004 06:24:24 - 1.589
@@ -21,8 +21,6 @@
* AntLikeTasksAtTopLevelTest failed on cygwin.
-* and are working together. Bugzilla report 27218
-
* I/O-intensive processes hung when executed via .
Bugzilla reports 23893/26852.
@@ -118,6 +116,8 @@
* and friends would delete the original file when trying to update
a read-only archive. Bugzilla Report 28419.
+
+* and are working together. Bugzilla report 27218
Other changes:
--
1.15 +29 -1 ant/src/main/org/apache/tools/ant/types/Assertions.java
Index: Assertions.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Assertions.java 14 Apr 2004 15:42:08 - 1.14
+++ Assertions.java 20 Apr 2004 06:24:25 - 1.15
@@ -20,9 +20,10 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
/**
* The assertion datatype. This type describes
@@ -199,6 +200,33 @@
BaseAssertion assertion = (BaseAssertion) it.next();
String arg = assertion.toCommand();
addVmArgument(command, arg);
+}
+}
+
+/**
+ * add the assertions to a list in a format suitable
+ * for adding to a command line
+ * @param commandList
+ */
+public void applyAssertions(final ListIterator commandIterator) {
+getProject().log("Applying assertions", Project.MSG_DEBUG);
+Assertions clause = getFinalReference();
+//do the system assertions
+if (Boolean.TRUE.equals(clause.enableSystemAssertions)) {
+getProject().log("Enabling system assertions",
Project.MSG_DEBUG);
+commandIterator.add("-enablesystemassertions");
+} else if (Boolean.FALSE.equals(clause.enableSystemAssertions)) {
+getProject().log("disabling system assertions",
Project.MSG_DEBUG);
+commandIterator.add("-disablesystemassertions");
+}
+
+//now any inner assertions
+Iterator it = clause.assertionList.iterator();
+while (it.hasNext()) {
+BaseAssertion assertion = (BaseAssertion) it.next();
+String arg = assertion.toCommand();
+getProject().log("adding assertion "+arg, Project.MSG_DEBUG);
+commandIterator.add(arg);
}
}
1.55 +1 -1
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
Index: CommandlineJava.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- CommandlineJava.java 14 Apr 2004 15:42:08 - 1.54
+++ CommandlineJava.java 20 Apr 2004 06:24:25 - 1.55
@@ -401,7 +401,7 @@
//now any assertions are added
if (getAssertions() != null) {
-getAssertions().applyAssertions(this);
+getAssertions().applyAssertions(listIterator);
}
// JDK usage command line says that -jar must be the first option,
as there is
1.24 +42 -0
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
Index: CommandlineJavaTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CommandlineJavaTest.java 9 Mar 2004 16:49:05 - 1.23
+++ CommandlineJavaTest.java 20 Apr 2004 06:24:25 - 1.24
@@ -18,6 +18,7 @@
package org.apache.tools.ant.types;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.uti
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
bodewig 2004/04/19 23:52:48
Modified:src/main/org/apache/tools/ant/taskdefs Java.java
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
Log:
Minor formatting changes
Revision ChangesPath
1.91 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Java.java 29 Mar 2004 17:02:13 - 1.90
+++ Java.java 20 Apr 2004 06:52:48 - 1.91
@@ -578,7 +578,7 @@
*/
public void setTimeout(Long value) {
timeout = value;
-incompatibleWithSpawn |= timeout!=null;
+incompatibleWithSpawn |= timeout != null;
}
/**
1.98 +6 -6
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- JUnitTask.java19 Apr 2004 14:25:43 - 1.97
+++ JUnitTask.java20 Apr 2004 06:52:48 - 1.98
@@ -608,10 +608,10 @@
* @since Ant 1.6
*/
public void setTempdir(File tmpDir) {
-if(tmpDir!=null) {
-if(!tmpDir.exists() || !tmpDir.isDirectory()) {
+if (tmpDir!=null) {
+if (!tmpDir.exists() || !tmpDir.isDirectory()) {
throw new BuildException(tmpDir.toString()
-+" is not a valid temp directory");
+ +" is not a valid temp directory");
}
}
this.tmpDir = tmpDir;
@@ -1094,7 +1094,7 @@
if (timeout == null) {
return null;
}
-return new ExecuteWatchdog((long)timeout.intValue());
+return new ExecuteWatchdog((long) timeout.intValue());
}
/**
@@ -1331,7 +1331,7 @@
* configure from a test; sets member variables to attributes of the
test
* @param test
*/
-public ForkedTestConfiguration(JUnitTest test) {
+ForkedTestConfiguration(JUnitTest test) {
this(test.getFiltertrace(),
test.getHaltonerror(),
test.getHaltonfailure(),
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java
bodewig 2004/04/19 23:53:30
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Java.java
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH JUnitTask.java
src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
Assertions.java CommandlineJava.java
src/testcases/org/apache/tools/ant/types Tag: ANT_16_BRANCH
CommandlineJavaTest.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.72 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.71
retrieving revision 1.503.2.72
diff -u -r1.503.2.71 -r1.503.2.72
--- WHATSNEW 16 Apr 2004 09:35:59 - 1.503.2.71
+++ WHATSNEW 20 Apr 2004 06:53:29 - 1.503.2.72
@@ -49,6 +49,8 @@
* and friends would delete the original file when trying to update
a read-only archive. Bugzilla Report 28419.
+* and are working together. Bugzilla report 27218
+
Other changes:
--
No revision
No revision
1.77.2.9 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.77.2.8
retrieving revision 1.77.2.9
diff -u -r1.77.2.8 -r1.77.2.9
--- Java.java 15 Mar 2004 11:29:13 - 1.77.2.8
+++ Java.java 20 Apr 2004 06:53:29 - 1.77.2.9
@@ -388,7 +388,7 @@
*/
public void setFailonerror(boolean fail) {
failOnError = fail;
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= fail;
}
/**
@@ -545,7 +545,7 @@
*/
public void setTimeout(Long value) {
timeout = value;
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= timeout != null;
}
/**
No revision
No revision
1.83.2.11 +76 -19
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.83.2.10
retrieving revision 1.83.2.11
diff -u -r1.83.2.10 -r1.83.2.11
--- JUnitTask.java16 Apr 2004 07:05:32 - 1.83.2.10
+++ JUnitTask.java20 Apr 2004 06:53:29 - 1.83.2.11
@@ -277,7 +277,7 @@
}
/**
- * Set the bahvior when [EMAIL PROTECTED] #setFork fork} fork has been
enabled.
+ * Set the behavior when [EMAIL PROTECTED] #setFork fork} fork has been
enabled.
*
* Possible values are "once", "perTest" and "perBatch". If
* set to "once", only a single Java VM will be forked for all
@@ -595,6 +595,12 @@
* @since Ant 1.6
*/
public void setTempdir(File tmpDir) {
+if (tmpDir!=null) {
+if (!tmpDir.exists() || !tmpDir.isDirectory()) {
+throw new BuildException(tmpDir.toString()
+ +" is not a valid temp directory");
+}
+}
this.tmpDir = tmpDir;
}
@@ -686,11 +692,7 @@
JUnitTest test = null;
// Create a temporary file to pass the test cases to run to
// the runner (one test case per line)
-File casesFile =
-FileUtils.newFileUtils().createTempFile("junittestcases",
-".properties",
-
getProject().getBaseDir());
-casesFile.deleteOnExit();
+File casesFile = createTempPropertiesFile("junittestcases");
PrintWriter writer = null;
try {
writer =
@@ -821,12 +823,8 @@
}
}
-// Create a temporary file to pass the Ant properties to the
-// forked test
-File propsFile =
-FileUtils.newFileUtils().createTempFile("junit", ".properties",
-tmpDir != null ? tmpDir : getProject().getBaseDir());
-propsFile.deleteOnExit();
+
+File propsFile = createTempPropertiesFile("junit");
cmd.createArgument().setValue("propsfile="
+ propsFile.ge
cvs commit: ant/xdocs external.xml
bodewig 2004/04/20 00:00:26 Modified:docs Tag: ANT_16_BRANCH external.html xdocsTag: ANT_16_BRANCH external.xml Log: Merge Revision ChangesPath No revision No revision 1.136.2.10 +1 -55 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.136.2.9 retrieving revision 1.136.2.10 diff -u -r1.136.2.9 -r1.136.2.10 --- external.html 24 Feb 2004 15:54:27 - 1.136.2.9 +++ external.html 20 Apr 2004 07:00:18 - 1.136.2.10 @@ -281,60 +281,6 @@ - -AntDoc - -AntDoc is a tool that generates HTML documentation from Ant -buildfiles; the generated HTML is inspired from what javadoc -yields. AntDocGUI offers a simple Ant target launcher named -AntDoc GUI. Ant targets may be launched from the generated -AntDoc HTML pages. Integration to various IDEs is in -progress. -AntDoc can be run via an Ant task, AntDoc GUI can be run -via an Ant task, or via a JVM launch. - - - - Compatibility: - - - Ant 1.4.1 and higher - - - - - URL: - - - http://antdoc.free.fr/";>http://antdoc.free.fr/ - - - - - Contact: - - - Edouard Mercier - - - - - License: - - - The Apache Software License - - - - Andariel @@ -5067,7 +5013,7 @@ - bundles Ant 1.6.0 as of NetBeans 3.6 + bundles Ant 1.6.1 as of NetBeans 3.6 No revision No revision 1.100.2.10 +1 -33 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.100.2.9 retrieving revision 1.100.2.10 diff -u -r1.100.2.9 -r1.100.2.10 --- external.xml 24 Feb 2004 15:54:26 - 1.100.2.9 +++ external.xml 20 Apr 2004 07:00:23 - 1.100.2.10 @@ -92,38 +92,6 @@ - - -AntDoc is a tool that generates HTML documentation from Ant -buildfiles; the generated HTML is inspired from what javadoc -yields. AntDocGUI offers a simple Ant target launcher named -AntDoc GUI. Ant targets may be launched from the generated -AntDoc HTML pages. Integration to various IDEs is in -progress. - -AntDoc can be run via an Ant task, AntDoc GUI can be run -via an Ant task, or via a JVM launch. - - - -Compatibility: -Ant 1.4.1 and higher - - -URL: -http://antdoc.free.fr/";>http://antdoc.free.fr/ - - -Contact: -Edouard Mercier - - -License: -The Apache Software License - - - - Andariel is a set of tasks designed to help the generation of HTML @@ -2742,7 +2710,7 @@ Compatibility: -bundles Ant 1.6.0 as of NetBeans 3.6 +bundles Ant 1.6.1 as of NetBeans 3.6 URL: - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs faq.xml
bodewig 2004/04/20 00:27:21
Modified:docs faq.html
docs/manual/OptionalTasks junit.html
xdocsfaq.xml
Log:
Document yet another classloading quirk within , PR: 24646
Revision ChangesPath
1.97 +31 -0 ant/docs/faq.html
Index: faq.html
===
RCS file: /home/cvs/ant/docs/faq.html,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- faq.html 14 Apr 2004 06:40:08 - 1.96
+++ faq.html 20 Apr 2004 07:27:20 - 1.97
@@ -348,6 +348,12 @@
can't seem to get the full stack trace.
+
+
+Using format="xml", <junit> fails with a
+NoClassDefFoundError if forked.
+
+
Answers
@@ -1622,6 +1628,31 @@
As a workaround, run your <java> task with
fork="true" and Ant will display the full
trace.
+
+
+
+Using format="xml", <junit> fails with a
+NoClassDefFoundError if forked.
+
+
+ The XML formatter needs the http://www.w3.org/DOM/";>DOM classes to work. If you
+are using JDK 1.4 or later they are included with your Java
+Runtime and this problem won't occur. If you are running JDK
+1.3 or earlier, the DOM classes have to be on your
+<junit> task's <classpath>.
+Prior to Ant 1.6.0 Ant would include the DOM
classes from
+the XML parser that is used by Ant itself if you set the
+includeAntRuntime attribute to true (the default). With Ant
+1.6.0 this has been changed as this behavior made it
+impossible to use a different XML parser in your tests.
+This means that you have to take care of the DOM
classes
+explicitly starting with Ant 1.6.0. If you don't need to set
+up a different XML parser for your tests, the easiest solution
+is to add
+
+<pathelement
path="${ant.home}/lib/xml-apis.jar:${ant.home}/lib/xercesImpl.jar"/>
+
+to your task's <classpath>.
1.34 +11 -1 ant/docs/manual/OptionalTasks/junit.html
Index: junit.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junit.html,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- junit.html6 Apr 2004 14:09:25 - 1.33
+++ junit.html20 Apr 2004 07:27:21 - 1.34
@@ -132,7 +132,11 @@
includeantruntime
Implicitly add the Ant classes required to run
- the tests and JUnit to the classpath in forked mode.
+ the tests and JUnit to the classpath in forked mode.
+ Note: Please read the Ant FAQ if you
+ want to set this to false and use the XML formatter
+ at the same time.
No; default is true.
@@ -290,6 +294,12 @@
If you use the XML formatter, it may not include the same output
that your tests have written as some characters are illegal in XML
documents and will be dropped.
+
+Note: Please read the Ant FAQ if you want to
+set the fork attribute to true, the includeAntRuntime
+attribute to false and use the XML formatter at the same
+time.
1.53 +34 -0 ant/xdocs/faq.xml
Index: faq.xml
===
RCS file: /home/cvs/ant/xdocs/faq.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- faq.xml 14 Apr 2004 06:40:08 - 1.52
+++ faq.xml 20 Apr 2004 07:27:21 - 1.53
@@ -1435,6 +1435,40 @@
trace.
+
+
+
+Using format="xml", <junit> fails with a
+NoClassDefFoundError if forked.
+
+
+
+The XML formatter needs the http://www.w3.org/DOM/";>DOM classes to work. If you
+are using JDK 1.4 or later they are included with your Java
+Runtime and this problem won't occur. If you are running JDK
+1.3 or earlier, the DOM classes have to be on your
+<junit> task's <classpath>.
+
+Prior to Ant 1.6.0 Ant would include the DOM classes from
+the XML parser that is used by Ant itself if you set the
+includeAntRuntime attribute to true (the default). With Ant
+1.6.0 this has been changed as this behavior made it
+impossible to use a different XML parse
cvs commit: ant/xdocs faq.xml
bodewig 2004/04/20 00:29:36
Modified:docs Tag: ANT_16_BRANCH faq.html
docs/manual/OptionalTasks Tag: ANT_16_BRANCH junit.html
xdocsTag: ANT_16_BRANCH faq.xml
Log:
merge
Revision ChangesPath
No revision
No revision
1.77.2.12 +31 -0 ant/docs/faq.html
Index: faq.html
===
RCS file: /home/cvs/ant/docs/faq.html,v
retrieving revision 1.77.2.11
retrieving revision 1.77.2.12
diff -u -r1.77.2.11 -r1.77.2.12
--- faq.html 14 Apr 2004 14:46:05 - 1.77.2.11
+++ faq.html 20 Apr 2004 07:29:35 - 1.77.2.12
@@ -345,6 +345,12 @@
can't seem to get the full stack trace.
+
+
+Using format="xml", <junit> fails with a
+NoClassDefFoundError if forked.
+
+
Answers
@@ -1619,6 +1625,31 @@
As a workaround, run your <java> task with
fork="true" and Ant will display the full
trace.
+
+
+
+Using format="xml", <junit> fails with a
+NoClassDefFoundError if forked.
+
+
+ The XML formatter needs the http://www.w3.org/DOM/";>DOM classes to work. If you
+are using JDK 1.4 or later they are included with your Java
+Runtime and this problem won't occur. If you are running JDK
+1.3 or earlier, the DOM classes have to be on your
+<junit> task's <classpath>.
+Prior to Ant 1.6.0 Ant would include the DOM
classes from
+the XML parser that is used by Ant itself if you set the
+includeAntRuntime attribute to true (the default). With Ant
+1.6.0 this has been changed as this behavior made it
+impossible to use a different XML parser in your tests.
+This means that you have to take care of the DOM
classes
+explicitly starting with Ant 1.6.0. If you don't need to set
+up a different XML parser for your tests, the easiest solution
+is to add
+
+<pathelement
path="${ant.home}/lib/xml-apis.jar:${ant.home}/lib/xercesImpl.jar"/>
+
+to your task's <classpath>.
No revision
No revision
1.30.2.4 +11 -1 ant/docs/manual/OptionalTasks/junit.html
Index: junit.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junit.html,v
retrieving revision 1.30.2.3
retrieving revision 1.30.2.4
diff -u -r1.30.2.3 -r1.30.2.4
--- junit.html9 Feb 2004 22:12:11 - 1.30.2.3
+++ junit.html20 Apr 2004 07:29:36 - 1.30.2.4
@@ -133,7 +133,11 @@
includeantruntime
Implicitly add the Ant classes required to run
- the tests and JUnit to the classpath in forked mode.
+ the tests and JUnit to the classpath in forked mode.
+ Note: Please read the Ant FAQ if you
+ want to set this to false and use the XML formatter
+ at the same time.
No; default is true.
@@ -282,6 +286,12 @@
If you use the XML formatter, it may not include the same output
that your tests have written as some characters are illegal in XML
documents and will be dropped.
+
+Note: Please read the Ant FAQ if you want to
+set the fork attribute to true, the includeAntRuntime
+attribute to false and use the XML formatter at the same
+time.
No revision
No revision
1.38.2.12 +34 -0 ant/xdocs/faq.xml
Index: faq.xml
===
RCS file: /home/cvs/ant/xdocs/faq.xml,v
retrieving revision 1.38.2.11
retrieving revision 1.38.2.12
diff -u -r1.38.2.11 -r1.38.2.12
--- faq.xml 14 Apr 2004 14:46:05 - 1.38.2.11
+++ faq.xml 20 Apr 2004 07:29:36 - 1.38.2.12
@@ -1435,6 +1435,40 @@
trace.
+
+
+
+Using format="xml", <junit> fails with a
+NoClassDefFoundError if forked.
+
+
+
+The XML formatter needs the http://www.w3.org/DOM/";>DOM classes to work. If you
+are using JDK 1.4 or later they are included with your Java
+Runtime and this problem won't occur. If you are running JDK
+1.3 or earlier, the DOM classes have to be on your
+<junit> task's <classpath>.
+
+Prior to Ant 1.6.0 Ant would include
cvs commit: ant/src/etc tagdiff.xsl
bodewig 2004/04/20 05:48:43 Modified:docs/manual dirtasks.html docs/manual/CoreTasks concat.html java.html docs/manual/CoreTypes xmlcatalog.html docs/manual/OptionalTasks ccm.html dotnet.html replaceregexp.html src/etc tagdiff.xsl Log: Various typo fixes by Jesse Glick, PR: 28480 Revision ChangesPath 1.22 +1 -1 ant/docs/manual/dirtasks.html Index: dirtasks.html === RCS file: /home/cvs/ant/docs/manual/dirtasks.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- dirtasks.html 9 Feb 2004 21:50:05 - 1.21 +++ dirtasks.html 20 Apr 2004 12:48:43 - 1.22 @@ -188,7 +188,7 @@ <tar> <zip> <ddcreator> - <ejbjar> + <ejbjar> <ejbc> <cab> <icontract> 1.11 +1 -1 ant/docs/manual/CoreTasks/concat.html Index: concat.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/concat.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- concat.html 9 Feb 2004 21:50:05 - 1.10 +++ concat.html 20 Apr 2004 12:48:43 - 1.11 @@ -18,7 +18,7 @@ - Paths and/or + Paths and/or FileSets and/or FileLists are used to select which files are to be concatenated. There is no 1.31 +5 -5 ant/docs/manual/CoreTasks/java.html Index: java.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- java.html 6 Apr 2004 14:09:25 - 1.30 +++ java.html 20 Apr 2004 12:48:43 - 1.31 @@ -94,7 +94,7 @@ failonerror Stop the buildprocess if the command exits with a - returncode other than 0. Default is "false" (see note) + returncode other than 0. Default is "false" (see note) No @@ -235,10 +235,10 @@ When the permission RuntimePermission exitVM has not been granted (or has been revoked) the System.exit() call will be intercepted and treated like indicated in failonerror. - -If you specify failonerror="true" and you do not specify permissions, -a set of default permissions will be added to your java invocation making sure that -a non zero return code will lead to a BuildException. +Note: +if you specify failonerror="true" and you do not specify permissions, +a set of default permissions will be added to your Java invocation to make sure that +a non-zero return code will lead to a BuildException. Settings will be ignored if fork is enabled. 1.9 +1 -1 ant/docs/manual/CoreTypes/xmlcatalog.html Index: xmlcatalog.html === RCS file: /home/cvs/ant/docs/manual/CoreTypes/xmlcatalog.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmlcatalog.html 9 Feb 2004 21:50:07 - 1.8 +++ xmlcatalog.html 20 Apr 2004 12:48:43 - 1.9 @@ -211,7 +211,7 @@ catalogpath The nested catalogpath element is a path-like structure listing catalog files to +href="../using.html#path">path-like structure listing catalog files to search. All files in this path are assumed to be OASIS catalog files, in either http://oasis-open.org/committees/entity/background/9401.html";> 1.11 +1 -1 ant/docs/manual/OptionalTasks/ccm.html Index: ccm.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ccm.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ccm.html 9 Feb 2004 21:50:08 - 1.10 +++ ccm.html 20 Apr 2004 12:48:43 - 1.11 @@ -61,7 +61,7 @@ Comment attribute mycomment is added as a task comment. The task used is the one set as the default. -CCMCheckout +CCMCheckout Description Task to perform a Checkout command to Continuus Parameters 1.19 +1 -1 ant/docs/manual/OptionalTasks/dotnet.html Index: dotnet.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- dotnet.html 9 Feb 2004 21:50:08 - 1.18 +++ dotnet.html 20 Apr 2004 12:48:43 - 1.19 @@ -94,7 +94,7 @@ - ImportTypelib .html + Im
cvs commit: ant/src/etc tagdiff.xsl
bodewig 2004/04/20 05:52:21 Modified:docs/manual Tag: ANT_16_BRANCH dirtasks.html docs/manual/CoreTasks Tag: ANT_16_BRANCH concat.html java.html docs/manual/CoreTypes Tag: ANT_16_BRANCH xmlcatalog.html docs/manual/OptionalTasks Tag: ANT_16_BRANCH ccm.html dotnet.html src/etc Tag: ANT_16_BRANCH tagdiff.xsl Log: merge Revision ChangesPath No revision No revision 1.20.2.3 +1 -1 ant/docs/manual/dirtasks.html Index: dirtasks.html === RCS file: /home/cvs/ant/docs/manual/dirtasks.html,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -r1.20.2.2 -r1.20.2.3 --- dirtasks.html 9 Feb 2004 22:12:06 - 1.20.2.2 +++ dirtasks.html 20 Apr 2004 12:52:20 - 1.20.2.3 @@ -189,7 +189,7 @@ <tar> <zip> <ddcreator> - <ejbjar> + <ejbjar> <ejbc> <cab> <icontract> No revision No revision 1.9.2.3 +1 -1 ant/docs/manual/CoreTasks/concat.html Index: concat.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/concat.html,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -u -r1.9.2.2 -r1.9.2.3 --- concat.html 9 Feb 2004 22:12:07 - 1.9.2.2 +++ concat.html 20 Apr 2004 12:52:20 - 1.9.2.3 @@ -19,7 +19,7 @@ - Paths and/or + Paths and/or FileSets and/or FileLists are used to select which files are to be concatenated. There is no 1.24.2.6 +5 -5 ant/docs/manual/CoreTasks/java.html Index: java.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v retrieving revision 1.24.2.5 retrieving revision 1.24.2.6 diff -u -r1.24.2.5 -r1.24.2.6 --- java.html 9 Feb 2004 22:12:07 - 1.24.2.5 +++ java.html 20 Apr 2004 12:52:20 - 1.24.2.6 @@ -95,7 +95,7 @@ failonerror Stop the buildprocess if the command exits with a - returncode other than 0. Default is "false" (see note) + returncode other than 0. Default is "false" (see note) No @@ -227,10 +227,10 @@ When the permission RuntimePermission exitVM has not been granted (or has been revoked) the System.exit() call will be intercepted and treated like indicated in failonerror. - -If you specify failonerror="true" and you do not specify permissions, -a set of default permissions will be added to your java invocation making sure that -a non zero return code will lead to a BuildException. +Note: +if you specify failonerror="true" and you do not specify permissions, +a set of default permissions will be added to your Java invocation to make sure that +a non-zero return code will lead to a BuildException. Settings will be ignored if fork is enabled. No revision No revision 1.7.2.3 +1 -1 ant/docs/manual/CoreTypes/xmlcatalog.html Index: xmlcatalog.html === RCS file: /home/cvs/ant/docs/manual/CoreTypes/xmlcatalog.html,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- xmlcatalog.html 9 Feb 2004 22:12:10 - 1.7.2.2 +++ xmlcatalog.html 20 Apr 2004 12:52:20 - 1.7.2.3 @@ -212,7 +212,7 @@ catalogpath The nested catalogpath element is a path-like structure listing catalog files to +href="../using.html#path">path-like structure listing catalog files to search. All files in this path are assumed to be OASIS catalog files, in either http://oasis-open.org/committees/entity/background/9401.html";> No revision No revision 1.9.2.3 +1 -1 ant/docs/manual/OptionalTasks/ccm.html Index: ccm.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ccm.html,v retrieving revision 1.9.2.2 retrieving revision 1.9.2.3 diff -u -r1.9.2.2 -r1.9.2.3 --- ccm.html 9 Feb 2004 22:12:11 - 1.9.2.2 +++ ccm.html 20 Apr 2004 12:52:20 - 1.9.2.3 @@ -62,7 +62,7 @@ Comment attribute mycomment is added as a task comment. The task used is the one set as the default. -CCMCheckout +CCMCheckout Description Task to perform a Checkout command to Continuus Parameters 1.10.2.11 +1 -1 ant/docs/manual/OptionalTasks/dotnet.html
cvs commit: ant WHATSNEW
bodewig 2004/04/20 06:25:08 Modified:.WHATSNEW Log: Generate proper file URLs in AntClassLoader#getResource, PR: 28060 Revision ChangesPath 1.590 +3 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.589 retrieving revision 1.590 diff -u -r1.589 -r1.590 --- WHATSNEW 20 Apr 2004 06:24:24 - 1.589 +++ WHATSNEW 20 Apr 2004 13:25:08 - 1.590 @@ -119,6 +119,9 @@ * and are working together. Bugzilla report 27218 +* AntClassLoader#getResource could return invalid URLs. Bugzilla + Report 28060. + Other changes: -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant AntClassLoader.java
bodewig 2004/04/20 06:25:08
Modified:src/main/org/apache/tools/ant AntClassLoader.java
Log:
Generate proper file URLs in AntClassLoader#getResource, PR: 28060
Revision ChangesPath
1.82 +5 -2 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- AntClassLoader.java 9 Mar 2004 16:47:59 - 1.81
+++ AntClassLoader.java 20 Apr 2004 13:25:08 - 1.82
@@ -32,6 +32,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.JavaEnvUtils;
import org.apache.tools.ant.util.LoaderUtils;
@@ -45,6 +46,8 @@
*/
public class AntClassLoader extends ClassLoader implements BuildListener {
+private static final FileUtils fileUtils = FileUtils.newFileUtils();
+
/**
* An enumeration of all resources of a given name found within the
* classpath of this class loader. This enumeration is used by the
@@ -888,7 +891,7 @@
if (resource.exists()) {
try {
-return new URL("file:" + resource.toString());
+return fileUtils.getFileURL(resource);
} catch (MalformedURLException ex) {
return null;
}
@@ -903,7 +906,7 @@
ZipEntry entry = zipFile.getEntry(resourceName);
if (entry != null) {
try {
-return new URL("jar:file:" + file.toString()
+return new URL("jar:" + fileUtils.getFileURL(file)
+ "!/" + entry);
} catch (MalformedURLException ex) {
return null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
bodewig 2004/04/20 06:25:15 Modified:.Tag: ANT_16_BRANCH WHATSNEW Log: merge Revision ChangesPath No revision No revision 1.503.2.73 +3 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.72 retrieving revision 1.503.2.73 diff -u -r1.503.2.72 -r1.503.2.73 --- WHATSNEW 20 Apr 2004 06:53:29 - 1.503.2.72 +++ WHATSNEW 20 Apr 2004 13:25:15 - 1.503.2.73 @@ -51,6 +51,9 @@ * and are working together. Bugzilla report 27218 +* AntClassLoader#getResource could return invalid URLs. Bugzilla + Report 28060. + Other changes: -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant AntClassLoader.java
bodewig 2004/04/20 06:25:15
Modified:src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
AntClassLoader.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.76.2.6 +5 -2 ant/src/main/org/apache/tools/ant/AntClassLoader.java
Index: AntClassLoader.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/AntClassLoader.java,v
retrieving revision 1.76.2.5
retrieving revision 1.76.2.6
diff -u -r1.76.2.5 -r1.76.2.6
--- AntClassLoader.java 9 Mar 2004 17:01:29 - 1.76.2.5
+++ AntClassLoader.java 20 Apr 2004 13:25:15 - 1.76.2.6
@@ -32,6 +32,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.JavaEnvUtils;
import org.apache.tools.ant.util.LoaderUtils;
@@ -45,6 +46,8 @@
*/
public class AntClassLoader extends ClassLoader implements BuildListener {
+private static final FileUtils fileUtils = FileUtils.newFileUtils();
+
/**
* An enumeration of all resources of a given name found within the
* classpath of this class loader. This enumeration is used by the
@@ -888,7 +891,7 @@
if (resource.exists()) {
try {
-return new URL("file:" + resource.toString());
+return fileUtils.getFileURL(resource);
} catch (MalformedURLException ex) {
return null;
}
@@ -903,7 +906,7 @@
ZipEntry entry = zipFile.getEntry(resourceName);
if (entry != null) {
try {
-return new URL("jar:file:" + file.toString()
+return new URL("jar:" + fileUtils.getFileURL(file)
+ "!/" + entry);
} catch (MalformedURLException ex) {
return null;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util FileUtils.java
bodewig 2004/04/21 00:12:29 Modified:src/main/org/apache/tools/ant/util FileUtils.java Log: One not too much Revision ChangesPath 1.67 +2 -2 ant/src/main/org/apache/tools/ant/util/FileUtils.java Index: FileUtils.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/util/FileUtils.java,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- FileUtils.java20 Apr 2004 15:02:38 - 1.66 +++ FileUtils.java21 Apr 2004 07:12:29 - 1.67 @@ -1150,7 +1150,7 @@ * This was originally an emulation of File.createNewFile for JDK 1.1, * but it is now implemented using that method (Ant1.7 onwards). * - * This method has not historically not guaranteed that the + * This method has historically not guaranteed that the * operation was atomic. In its current implementation it is. * * @param f the file to be created - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/launch Locator.java
bodewig 2004/04/21 00:18:49
Modified:.WHATSNEW
src/main/org/apache/tools/ant/launch Locator.java
Log:
don't depend on jre being lowercase, PR: 25798
Revision ChangesPath
1.593 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- WHATSNEW 20 Apr 2004 21:39:28 - 1.592
+++ WHATSNEW 21 Apr 2004 07:18:48 - 1.593
@@ -122,6 +122,9 @@
* AntClassLoader#getResource could return invalid URLs. Bugzilla
Report 28060.
+* Ant failed to locate tools.jar if the jre directory name wasn't all
+ lowercase. Bugzilla Report 25798.
+
Other changes:
--
1.14 +2 -1 ant/src/main/org/apache/tools/ant/launch/Locator.java
Index: Locator.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Locator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Locator.java 5 Apr 2004 21:26:45 - 1.13
+++ Locator.java 21 Apr 2004 07:18:48 - 1.14
@@ -23,6 +23,7 @@
import java.io.FilenameFilter;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
+import java.util.Locale;
/**
* The Locator is a utility class which is used to find certain items
@@ -181,7 +182,7 @@
// couldn't find compiler - try to find tools.jar
// based on java.home setting
String javaHome = System.getProperty("java.home");
-if (javaHome.endsWith("jre")) {
+if (javaHome.toLowerCase(Locale.US).endsWith("jre")) {
javaHome = javaHome.substring(0, javaHome.length() - 4);
}
File toolsJar = new File(javaHome + "/lib/tools.jar");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/launch Locator.java
bodewig 2004/04/21 00:19:13
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/launch Tag: ANT_16_BRANCH
Locator.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.78 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.77
retrieving revision 1.503.2.78
diff -u -r1.503.2.77 -r1.503.2.78
--- WHATSNEW 20 Apr 2004 22:32:28 - 1.503.2.77
+++ WHATSNEW 21 Apr 2004 07:19:13 - 1.503.2.78
@@ -58,6 +58,9 @@
* replacestring tokenfilter only replaced the first occurrence.
+* Ant failed to locate tools.jar if the jre directory name wasn't all
+ lowercase. Bugzilla Report 25798.
+
Other changes:
--
No revision
No revision
1.6.2.6 +2 -1 ant/src/main/org/apache/tools/ant/launch/Locator.java
Index: Locator.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/launch/Locator.java,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -u -r1.6.2.5 -r1.6.2.6
--- Locator.java 9 Mar 2004 17:01:32 - 1.6.2.5
+++ Locator.java 21 Apr 2004 07:19:13 - 1.6.2.6
@@ -23,6 +23,7 @@
import java.io.FilenameFilter;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
+import java.util.Locale;
/**
* The Locator is a utility class which is used to find certain items
@@ -172,7 +173,7 @@
// couldn't find compiler - try to find tools.jar
// based on java.home setting
String javaHome = System.getProperty("java.home");
-if (javaHome.endsWith("jre")) {
+if (javaHome.toLowerCase(Locale.US).endsWith("jre")) {
javaHome = javaHome.substring(0, javaHome.length() - 4);
}
File toolsJar = new File(javaHome + "/lib/tools.jar");
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util ReaderInputStream.java
bodewig 2004/04/23 00:33:52
Modified:docs/manual/CoreTypes redirector.html
src/main/org/apache/tools/ant/taskdefs ExecTask.java
Java.java Redirector.java
src/main/org/apache/tools/ant/types RedirectorElement.java
src/main/org/apache/tools/ant/util ReaderInputStream.java
Log:
The small things you find when reviewing code
Revision ChangesPath
1.2 +1 -1 ant/docs/manual/CoreTypes/redirector.html
Index: redirector.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTypes/redirector.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redirector.html 31 Mar 2004 21:47:42 - 1.1
+++ redirector.html 23 Apr 2004 07:33:51 - 1.2
@@ -139,7 +139,7 @@
The expected behavior of a <redirector> is to a great degree
dependent on the supporting task. Any possible points of confusion
-should be noted at the task level.
+should be noted at the task level.
Copyright © 2004 The Apache Software Foundation. All
rights
Reserved.
1.70 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ExecTask.java 14 Apr 2004 15:42:06 - 1.69
+++ ExecTask.java 23 Apr 2004 07:33:51 - 1.70
@@ -190,7 +190,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= logError;
}
/**
@@ -236,7 +236,7 @@
*/
public void setFailonerror(boolean fail) {
failOnError = fail;
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= fail;
}
/**
@@ -308,8 +308,8 @@
* @param result value desired for the result property value
*/
protected void maybeSetResultPropertyValue(int result) {
-String res = Integer.toString(result);
if (resultProperty != null) {
+String res = Integer.toString(result);
getProject().setNewProperty(resultProperty, res);
}
}
1.92 +2 -1 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- Java.java 20 Apr 2004 06:52:48 - 1.91
+++ Java.java 23 Apr 2004 07:33:51 - 1.92
@@ -332,6 +332,7 @@
*/
public void setResultProperty(String resultProperty) {
this.resultProperty = resultProperty;
+incompatibleWithSpawn = true;
}
/**
@@ -474,7 +475,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= logError;
}
/**
1.19 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Index: Redirector.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Redirector.java 14 Apr 2004 15:42:06 - 1.18
+++ Redirector.java 23 Apr 2004 07:33:51 - 1.19
@@ -78,7 +78,7 @@
/**
* The file(s) from which standard input is being taken.
- * If > 1, files' content will be concatenated in the order received.
+ * If > 1, files' content will be concatenated in the order received.
*/
private File[] input;
@@ -137,7 +137,7 @@
/** The stream for input */
private InputStream inputStream = null;
-/** Stream which are used for line oriented output */
+/** Stream which is used for line oriented output */
private PrintStream outPrintStream = null;
/** Stream which is used for line oriented error output */
1.2 +8 -4
ant/src/main/org/apache/tools/ant/types/RedirectorElement.java
Index: RedirectorElement.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/types/RedirectorElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RedirectorElement.java27 Mar 2004 21:22:58 - 1.1
+++ RedirectorElement.java23 A
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ExecTask.java Java.java Redirector.java
bodewig 2004/04/23 00:41:02
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ExecTask.java Java.java Redirector.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.61.2.8 +3 -3 ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
Index: ExecTask.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ExecTask.java,v
retrieving revision 1.61.2.7
retrieving revision 1.61.2.8
diff -u -r1.61.2.7 -r1.61.2.8
--- ExecTask.java 14 Apr 2004 15:42:40 - 1.61.2.7
+++ ExecTask.java 23 Apr 2004 07:41:02 - 1.61.2.8
@@ -174,7 +174,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= logError;
}
/**
@@ -220,7 +220,7 @@
*/
public void setFailonerror(boolean fail) {
failOnError = fail;
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= fail;
}
/**
@@ -292,8 +292,8 @@
* @param result value desired for the result property value
*/
protected void maybeSetResultPropertyValue(int result) {
-String res = Integer.toString(result);
if (resultProperty != null) {
+String res = Integer.toString(result);
getProject().setNewProperty(resultProperty, res);
}
}
1.77.2.10 +2 -1 ant/src/main/org/apache/tools/ant/taskdefs/Java.java
Index: Java.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
retrieving revision 1.77.2.9
retrieving revision 1.77.2.10
diff -u -r1.77.2.9 -r1.77.2.10
--- Java.java 20 Apr 2004 06:53:29 - 1.77.2.9
+++ Java.java 23 Apr 2004 07:41:02 - 1.77.2.10
@@ -306,6 +306,7 @@
*/
public void setResultProperty(String resultProperty) {
this.resultProperty = resultProperty;
+incompatibleWithSpawn = true;
}
/**
@@ -441,7 +442,7 @@
*/
public void setLogError(boolean logError) {
redirector.setLogError(logError);
-incompatibleWithSpawn = true;
+incompatibleWithSpawn |= logError;
}
/**
1.11.2.6 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java
Index: Redirector.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Redirector.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- Redirector.java 22 Apr 2004 21:33:06 - 1.11.2.5
+++ Redirector.java 23 Apr 2004 07:41:02 - 1.11.2.6
@@ -98,7 +98,7 @@
/** The stream for input */
private InputStream inputStream = null;
-/** Stream which are used for line oriented output */
+/** Stream which is used for line oriented output */
private PrintStream outPrintStream = null;
/** Stream which is used for line oriented error output */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs ProtectedJarMethodsTest.java
bodewig 2004/04/23 03:03:50 Modified:.build.xml src/main/org/apache/tools/ant/taskdefs Jar.java Java.java Added: src/testcases/org/apache/tools/ant/taskdefs ProtectedJarMethodsTest.java Log: Implement jar index for referenced jars, PR: 14255 Revision ChangesPath 1.417 +2 -0 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.416 retrieving revision 1.417 diff -u -r1.416 -r1.417 --- build.xml 15 Apr 2004 13:53:47 - 1.416 +++ build.xml 23 Apr 2004 10:03:49 - 1.417 @@ -1551,6 +1551,8 @@ unless="tests.and.ant.share.classloader"/> +
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/script ScriptDef.java
bodewig 2004/04/23 07:18:15
Modified:.WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/script
ScriptDef.java
Log:
Make attribute und element names in lowercase (like
does) to avoid problems with name="Foo" -> the task X doesn\'t support the
attribute foo
Revision ChangesPath
1.595 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -r1.594 -r1.595
--- WHATSNEW 22 Apr 2004 21:36:34 - 1.594
+++ WHATSNEW 23 Apr 2004 14:18:14 - 1.595
@@ -125,6 +125,8 @@
cases; when split file-property, files were only created if
writes were performed.
+* fixed case handling of scriptdef attributes and elements.
+
Other changes:
--
1.13 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
Index: ScriptDef.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ScriptDef.java9 Mar 2004 16:48:35 - 1.12
+++ ScriptDef.java23 Apr 2004 14:18:15 - 1.13
@@ -27,6 +27,7 @@
import java.util.Map;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Set;
@@ -93,7 +94,7 @@
* @param name the attribute name
*/
public void setName(String name) {
-this.name = name;
+this.name = name.toLowerCase(Locale.US);
}
}
@@ -125,7 +126,7 @@
* @param name the name of this nested element
*/
public void setName(String name) {
-this.name = name;
+this.name = name.toLowerCase(Locale.US);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/script ScriptDef.java
bodewig 2004/04/23 07:19:09
Modified:.Tag: ANT_16_BRANCH WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/script Tag:
ANT_16_BRANCH ScriptDef.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.80 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.79
retrieving revision 1.503.2.80
diff -u -r1.503.2.79 -r1.503.2.80
--- WHATSNEW 22 Apr 2004 21:33:06 - 1.503.2.79
+++ WHATSNEW 23 Apr 2004 14:19:09 - 1.503.2.80
@@ -149,6 +149,8 @@
* failOnAny attribute for was broken. Bugzilla Report 28122.
+* fixed case handling of scriptdef attributes and elements.
+
Other changes:
--
No revision
No revision
1.7.2.6 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
Index: ScriptDef.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- ScriptDef.java9 Mar 2004 17:01:52 - 1.7.2.5
+++ ScriptDef.java23 Apr 2004 14:19:09 - 1.7.2.6
@@ -27,6 +27,7 @@
import java.util.Map;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Set;
@@ -93,7 +94,7 @@
* @param name the attribute name
*/
public void setName(String name) {
-this.name = name;
+this.name = name.toLowerCase(Locale.US);
}
}
@@ -125,7 +126,7 @@
* @param name the name of this nested element
*/
public void setName(String name) {
-this.name = name;
+this.name = name.toLowerCase(Locale.US);
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks scriptdef.html
bodewig 2004/04/23 07:26:47 Modified:docs/manual/OptionalTasks scriptdef.html Log: Make attribute und element names in lowercase (like does) to avoid problems with name="Foo" -> the task X doesn\'t support the attribute foo Revision ChangesPath 1.5 +5 -0 ant/docs/manual/OptionalTasks/scriptdef.html Index: scriptdef.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scriptdef.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scriptdef.html16 Feb 2004 04:37:24 - 1.4 +++ scriptdef.html23 Apr 2004 14:26:47 - 1.5 @@ -36,6 +36,11 @@ The instances in this list may be accessed by an integer index. +Note: Ant will turn all attribute and element names into all +lowercase names, so even if you use name="SomeAttribute", you'll have +to use "someattribute" to retrieve the attribute's value from the +attributes collection. + The name "project" is a pre-defined reference to the Ant Project. For more information on writing scripts, please refer to the <script> task - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks scriptdef.html
bodewig 2004/04/23 07:27:00 Modified:docs/manual/OptionalTasks Tag: ANT_16_BRANCH scriptdef.html Log: merge Revision ChangesPath No revision No revision 1.1.2.4 +5 -0 ant/docs/manual/OptionalTasks/scriptdef.html Index: scriptdef.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/scriptdef.html,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -r1.1.2.3 -r1.1.2.4 --- scriptdef.html9 Feb 2004 22:12:12 - 1.1.2.3 +++ scriptdef.html23 Apr 2004 14:27:00 - 1.1.2.4 @@ -37,6 +37,11 @@ The instances in this list may be accessed by an integer index. +Note: Ant will turn all attribute and element names into all +lowercase names, so even if you use name="SomeAttribute", you'll have +to use "someattribute" to retrieve the attribute's value from the +attributes collection. + The name "project" is a pre-defined reference to the Ant Project. For more information on writing scripts, please refer to the <script> task - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
bodewig 2004/04/27 00:44:48
Modified:.WHATSNEW build.xml
docs/manual/OptionalTasks junit.html
src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
Log:
forkstyle -> forkmode
Revision ChangesPath
1.602 +5 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.601
retrieving revision 1.602
diff -u -r1.601 -r1.602
--- WHATSNEW 26 Apr 2004 19:23:53 - 1.601
+++ WHATSNEW 27 Apr 2004 07:44:46 - 1.602
@@ -161,6 +161,11 @@
* New "pattern" attribute for selector.
+* has a new forkmode attribute that controls the number of
+ Java VMs that get created when forking tests. This allows you to
+ run all tests in a single forked JVM reducing the overhead of VM
+ creation a lot. Bugzilla Report 24697.
+
Changes from Ant 1.6.0 to Ant 1.6.1
=
1.418 +2 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- build.xml 23 Apr 2004 10:03:49 - 1.417
+++ build.xml 27 Apr 2004 07:44:46 - 1.418
@@ -53,7 +53,7 @@
-
+
1.35 +18 -0 ant/docs/manual/OptionalTasks/junit.html
Index: junit.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junit.html,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- junit.html20 Apr 2004 07:27:21 - 1.34
+++ junit.html27 Apr 2004 07:44:47 - 1.35
@@ -68,6 +68,24 @@
No; default is off.
+forkmode
+Controls how many Java Virtual Machines get
+created if you want to fork some tests. Possible values are
+"perTest" (the default), "perBatch" and
+"once". "once" creates only a single Java VM
+for all tests while "perTest" creates a new VM for each
+TestCase class. "perBatch" creates a VM for each nested
+<batchtest> and one collecting all nested
+<test>s. Note that only tests with the same
+settings of filtertrace, haltonerror,
+haltonfailure, errorproperty and
+failureproperty can share a VM, so even if you set
+forkmode to "once", Ant may have to create
+more than a single Java VM. This attribute is ignored for tests
+that don't get forked into a new Java VM.
+No; default is perTest.
+
+
haltonerror
Stop the build process if an error occurs during the
test
run.
1.99 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- JUnitTask.java20 Apr 2004 06:52:48 - 1.98
+++ JUnitTask.java27 Apr 2004 07:44:47 - 1.99
@@ -147,7 +147,7 @@
private File tmpDir;
private AntClassLoader classLoader = null;
private Permissions perm = null;
-private ForkStyle forkStyle = new ForkStyle("perTest");
+private ForkMode forkMode = new ForkMode("perTest");
private static final int STRING_BUFFER_SIZE = 128;
@@ -295,8 +295,8 @@
*
* @since Ant 1.6.2
*/
-public void setForkStyle(ForkStyle style) {
-this.forkStyle = style;
+public void setForkMode(ForkMode mode) {
+this.forkMode = mode;
}
/**
@@ -641,11 +641,11 @@
public void execute() throws BuildException {
List testLists = new ArrayList();
-boolean forkPerTest =
forkStyle.getValue().equals(ForkStyle.PER_TEST);
-if (forkPerTest || forkStyle.getValue().equals(ForkStyle.ONCE)) {
+boolean forkPerTest = forkMode.getValue().equals(ForkMode.PER_TEST);
+if (forkPerTest || forkMode.getValue().equals(ForkMode.ONCE)) {
testLists.addAll(executeOrQueue(getIndividualTests(),
forkPerTest));
-} else { /* forkStyle.getValue().equals(ForkStyle.PER_BATCH) */
+} else { /* forkMode.getValue().equals(ForkMode.PER_BATCH) */
final int count = batchTests.size();
for (int i = 0; i < count; i++) {
BatchTest
cvs commit: ant/docs/manual/OptionalTasks junit.html
bodewig 2004/04/27 00:45:34 Modified:docs/manual/OptionalTasks junit.html Log: @since Revision ChangesPath 1.36 +1 -1 ant/docs/manual/OptionalTasks/junit.html Index: junit.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junit.html,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- junit.html27 Apr 2004 07:44:47 - 1.35 +++ junit.html27 Apr 2004 07:45:34 - 1.36 @@ -82,7 +82,7 @@ failureproperty can share a VM, so even if you set forkmode to "once", Ant may have to create more than a single Java VM. This attribute is ignored for tests -that don't get forked into a new Java VM. +that don't get forked into a new Java VM. since Ant 1.6.2 No; default is perTest. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/junit JUnitTask.java
bodewig 2004/04/27 00:45:48
Modified:.Tag: ANT_16_BRANCH WHATSNEW build.xml
docs/manual/OptionalTasks Tag: ANT_16_BRANCH junit.html
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH JUnitTask.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.88 +5 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.87
retrieving revision 1.503.2.88
diff -u -r1.503.2.87 -r1.503.2.88
--- WHATSNEW 26 Apr 2004 19:20:24 - 1.503.2.87
+++ WHATSNEW 27 Apr 2004 07:45:47 - 1.503.2.88
@@ -114,6 +114,11 @@
* New "pattern" attribute for selector.
+* has a new forkmode attribute that controls the number of
+ Java VMs that get created when forking tests. This allows you to
+ run all tests in a single forked JVM reducing the overhead of VM
+ creation a lot. Bugzilla Report 24697.
+
Changes from Ant 1.6.0 to Ant 1.6.1
===
1.392.2.25 +2 -2 ant/build.xml
Index: build.xml
===
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.392.2.24
retrieving revision 1.392.2.25
diff -u -r1.392.2.24 -r1.392.2.25
--- build.xml 16 Apr 2004 07:05:32 - 1.392.2.24
+++ build.xml 27 Apr 2004 07:45:47 - 1.392.2.25
@@ -53,7 +53,7 @@
-
+
No revision
No revision
1.30.2.5 +18 -0 ant/docs/manual/OptionalTasks/junit.html
Index: junit.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junit.html,v
retrieving revision 1.30.2.4
retrieving revision 1.30.2.5
diff -u -r1.30.2.4 -r1.30.2.5
--- junit.html20 Apr 2004 07:29:36 - 1.30.2.4
+++ junit.html27 Apr 2004 07:45:47 - 1.30.2.5
@@ -69,6 +69,24 @@
No; default is off.
+forkmode
+Controls how many Java Virtual Machines get
+created if you want to fork some tests. Possible values are
+"perTest" (the default), "perBatch" and
+"once". "once" creates only a single Java VM
+for all tests while "perTest" creates a new VM for each
+TestCase class. "perBatch" creates a VM for each nested
+<batchtest> and one collecting all nested
+<test>s. Note that only tests with the same
+settings of filtertrace, haltonerror,
+haltonfailure, errorproperty and
+failureproperty can share a VM, so even if you set
+forkmode to "once", Ant may have to create
+more than a single Java VM. This attribute is ignored for tests
+that don't get forked into a new Java VM. since Ant 1.6.2
+No; default is perTest.
+
+
haltonerror
Stop the build process if an error occurs during the
test
run.
No revision
No revision
1.83.2.12 +10 -10
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.83.2.11
retrieving revision 1.83.2.12
diff -u -r1.83.2.11 -r1.83.2.12
--- JUnitTask.java20 Apr 2004 06:53:29 - 1.83.2.11
+++ JUnitTask.java27 Apr 2004 07:45:47 - 1.83.2.12
@@ -147,7 +147,7 @@
private File tmpDir;
private AntClassLoader classLoader = null;
private Permissions perm = null;
-private ForkStyle forkStyle = new ForkStyle("perTest");
+private ForkMode forkMode = new ForkMode("perTest");
private static final int STRING_BUFFER_SIZE = 128;
@@ -295,8 +295,8 @@
*
* @since Ant 1.6.2
*/
-public void setForkStyle(ForkStyle style) {
-this.forkStyle = style;
+public void setForkMode(ForkMode mode) {
+this.forkMode = mode;
}
/**
@@ -628,11 +628,11 @@
public void execute() throws BuildException {
List testLists = new ArrayList();
-boolean forkPerTest =
forkStyle.getValue().equals(ForkStyle.PER_TEST);
-if (forkPerTest || forkStyle.getValue().equals(ForkStyle.ONCE)) {
+boolean forkPerTest = forkMode.getValue().equals(ForkMode.PER_TEST);
+if (forkPerTest || forkMode.getValue().equals(ForkMode.ONCE)) {
testLists.addAll(executeOrQueue(getIndividualTest
cvs commit: ant CONTRIBUTORS
bodewig 2004/04/27 23:18:08 Modified:.CONTRIBUTORS Log: Anton Mazkovoi has provided the base for PR 24697 Revision ChangesPath 1.15 +1 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS === RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- CONTRIBUTORS 16 Apr 2004 11:50:41 - 1.14 +++ CONTRIBUTORS 28 Apr 2004 06:18:08 - 1.15 @@ -6,6 +6,7 @@ Anil K. Vijendran Anli Shundi Antoine Levy-Lambert +Anton Mazkovoi Arnaud Vandyck Arnout J. Kuiper Aslak Hellesøy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant CONTRIBUTORS
bodewig 2004/04/27 23:18:40 Modified:.Tag: ANT_16_BRANCH CONTRIBUTORS Log: merge Revision ChangesPath No revision No revision 1.1.2.10 +1 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS === RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -r1.1.2.9 -r1.1.2.10 --- CONTRIBUTORS 16 Apr 2004 11:52:18 - 1.1.2.9 +++ CONTRIBUTORS 28 Apr 2004 06:18:40 - 1.1.2.10 @@ -6,6 +6,7 @@ Anil K. Vijendran Anli Shundi Antoine Levy-Lambert +Anton Mazkovoi Arnaud Vandyck Arnout J. Kuiper Aslak Hellesøy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs external.xml
bodewig 2004/04/29 23:21:25 Modified:docs external.html xdocsexternal.xml Log: Add pointer to JReleaseInfo, submitted by Thomas Cotting Revision ChangesPath 1.162 +53 -0 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- external.html 20 Apr 2004 05:46:48 - 1.161 +++ external.html 30 Apr 2004 06:21:25 - 1.162 @@ -2630,6 +2630,59 @@ + +JReleaseInfo + +Sometimes you are interested at runtime to have information +from build time. This may be the build date, a build number or +the version. The JReleaseInfo Ant Task generates a java +source file with getter methods for any desired and provided +properties. Furthermore, it can automatically generate a +viewer (which can e.g. be used as main-class in a library jar +file) that shows the included release information. + + + + Compatibility: + + + Ant 1.6 and later + + + + + URL: + + + http://jreleaseinfo.sourceforge.net/";>HomePage on SourceForge + + + + + Contact: + + + http://sourceforge.net/projects/jreleaseinfo/";>Forums/Tracker on SourceForge + + + + + License: + + + Apache Software License + + + + JRun Ant Tasks 1.122 +31 -0 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- external.xml 20 Apr 2004 05:46:48 - 1.121 +++ external.xml 30 Apr 2004 06:21:25 - 1.122 @@ -1403,6 +1403,37 @@ + + +Sometimes you are interested at runtime to have information +from build time. This may be the build date, a build number or +the version. The JReleaseInfo Ant Task generates a java +source file with getter methods for any desired and provided +properties. Furthermore, it can automatically generate a +viewer (which can e.g. be used as main-class in a library jar +file) that shows the included release information. + + + +Compatibility: +Ant 1.6 and later + + +URL: +http://jreleaseinfo.sourceforge.net/";>HomePage on SourceForge + + +Contact: +http://sourceforge.net/projects/jreleaseinfo/";>Forums/Tracker on SourceForge + + +License: +Apache Software License + + + + JRun 4 SP1 ships with lib/jrun-ant-tasks.jar, which defines - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs external.xml
bodewig 2004/04/29 23:23:09 Modified:docs Tag: ANT_16_BRANCH external.html xdocsTag: ANT_16_BRANCH external.xml Log: merge Revision ChangesPath No revision No revision 1.136.2.11 +53 -0 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.136.2.10 retrieving revision 1.136.2.11 diff -u -r1.136.2.10 -r1.136.2.11 --- external.html 20 Apr 2004 07:00:18 - 1.136.2.10 +++ external.html 30 Apr 2004 06:23:09 - 1.136.2.11 @@ -2627,6 +2627,59 @@ + +JReleaseInfo + +Sometimes you are interested at runtime to have information +from build time. This may be the build date, a build number or +the version. The JReleaseInfo Ant Task generates a java +source file with getter methods for any desired and provided +properties. Furthermore, it can automatically generate a +viewer (which can e.g. be used as main-class in a library jar +file) that shows the included release information. + + + + Compatibility: + + + Ant 1.6 and later + + + + + URL: + + + http://jreleaseinfo.sourceforge.net/";>HomePage on SourceForge + + + + + Contact: + + + http://sourceforge.net/projects/jreleaseinfo/";>Forums/Tracker on SourceForge + + + + + License: + + + Apache Software License + + + + JRun Ant Tasks No revision No revision 1.100.2.11 +31 -0 ant/xdocs/external.xml Index: external.xml === RCS file: /home/cvs/ant/xdocs/external.xml,v retrieving revision 1.100.2.10 retrieving revision 1.100.2.11 diff -u -r1.100.2.10 -r1.100.2.11 --- external.xml 20 Apr 2004 07:00:23 - 1.100.2.10 +++ external.xml 30 Apr 2004 06:23:09 - 1.100.2.11 @@ -1403,6 +1403,37 @@ + + +Sometimes you are interested at runtime to have information +from build time. This may be the build date, a build number or +the version. The JReleaseInfo Ant Task generates a java +source file with getter methods for any desired and provided +properties. Furthermore, it can automatically generate a +viewer (which can e.g. be used as main-class in a library jar +file) that shows the included release information. + + + +Compatibility: +Ant 1.6 and later + + +URL: +http://jreleaseinfo.sourceforge.net/";>HomePage on SourceForge + + +Contact: +http://sourceforge.net/projects/jreleaseinfo/";>Forums/Tracker on SourceForge + + +License: +Apache Software License + + + + JRun 4 SP1 ships with lib/jrun-ant-tasks.jar, which defines - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks junit.html
bodewig 2004/05/11 04:46:49 Modified:docs/manual/CoreTasks java.html docs/manual/OptionalTasks junit.html Log: Assertions require fork Revision ChangesPath 1.32 +2 -0 ant/docs/manual/CoreTasks/java.html Index: java.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- java.html 20 Apr 2004 12:48:43 - 1.31 +++ java.html 11 May 2004 11:46:49 - 1.32 @@ -250,6 +250,8 @@ <assertions> subelement. +Assertion statements are currently ignored in non-forked mode. + since Ant 1.6. redirector 1.37 +2 -0 ant/docs/manual/OptionalTasks/junit.html Index: junit.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junit.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- junit.html27 Apr 2004 07:45:34 - 1.36 +++ junit.html11 May 2004 11:46:49 - 1.37 @@ -290,6 +290,8 @@ <assertions> subelement. +Assertion statements are currently ignored in non-forked mode. + since Ant 1.6. formatter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/OptionalTasks junit.html
bodewig 2004/05/11 04:48:42 Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH java.html docs/manual/OptionalTasks Tag: ANT_16_BRANCH junit.html Log: merge Revision ChangesPath No revision No revision 1.24.2.7 +2 -0 ant/docs/manual/CoreTasks/java.html Index: java.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v retrieving revision 1.24.2.6 retrieving revision 1.24.2.7 diff -u -r1.24.2.6 -r1.24.2.7 --- java.html 20 Apr 2004 12:52:20 - 1.24.2.6 +++ java.html 11 May 2004 11:48:42 - 1.24.2.7 @@ -242,6 +242,8 @@ <assertions> subelement. +Assertion statements are currently ignored in non-forked mode. + since Ant 1.6. Errors and return codes No revision No revision 1.30.2.6 +2 -0 ant/docs/manual/OptionalTasks/junit.html Index: junit.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junit.html,v retrieving revision 1.30.2.5 retrieving revision 1.30.2.6 diff -u -r1.30.2.5 -r1.30.2.6 --- junit.html27 Apr 2004 07:45:47 - 1.30.2.5 +++ junit.html11 May 2004 11:48:42 - 1.30.2.6 @@ -282,6 +282,8 @@ <assertions> subelement. +Assertion statements are currently ignored in non-forked mode. + since Ant 1.6. formatter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/Integration VAJAntTool.html
bodewig 2004/05/11 04:53:07 Modified:docs/manual/Integration VAJAntTool.html Log: 2004 Revision ChangesPath 1.22 +1 -1 ant/docs/manual/Integration/VAJAntTool.html Index: VAJAntTool.html === RCS file: /home/cvs/ant/docs/manual/Integration/VAJAntTool.html,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- VAJAntTool.html 6 May 2004 09:08:43 - 1.21 +++ VAJAntTool.html 11 May 2004 11:53:07 - 1.22 @@ -562,7 +562,7 @@ Added documentation for haltonerror, "*" and "**" version qualifiers. -Copyright © 2001-2003 Apache Software +Copyright © 2001-2004 The Apache Software Foundation. All rights Reserved. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java
bodewig 2004/05/13 00:01:08
Modified:src/etc/testcases/taskdefs defaultexcludes.xml
src/testcases/org/apache/tools/ant/taskdefs
DefaultExcludesTest.java
Log:
test1 failed unless it was the first test to run.
CVS: --
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision ChangesPath
1.3 +4 -0 ant/src/etc/testcases/taskdefs/defaultexcludes.xml
Index: defaultexcludes.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/defaultexcludes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- defaultexcludes.xml 21 Jul 2003 10:52:19 - 1.2
+++ defaultexcludes.xml 13 May 2004 07:01:07 - 1.3
@@ -2,6 +2,10 @@
+
+
+
+
1.8 +4 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java
Index: DefaultExcludesTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/DefaultExcludesTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultExcludesTest.java 9 Mar 2004 16:48:57 - 1.7
+++ DefaultExcludesTest.java 13 May 2004 07:01:07 - 1.8
@@ -32,6 +32,10 @@
configureProject("src/etc/testcases/taskdefs/defaultexcludes.xml");
}
+public void tearDown() {
+project.executeTarget("cleanup");
+}
+
// Output the default excludes
public void test1() {
String[] expected = {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/filters ConcatFilterTest.java
bodewig 2004/05/13 00:01:49
Modified:src/etc/testcases/filters concat.xml
src/testcases/org/apache/tools/ant/filters
ConcatFilterTest.java
Log:
Make tests pass on MacOS X.
CVS: --
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision ChangesPath
1.5 +2 -0 ant/src/etc/testcases/filters/concat.xml
Index: concat.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/filters/concat.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- concat.xml25 Sep 2003 06:12:25 - 1.4
+++ concat.xml13 May 2004 07:01:48 - 1.5
@@ -7,6 +7,8 @@
+
+
1.11 +3 -1
ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java
Index: ConcatFilterTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/filters/ConcatFilterTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConcatFilterTest.java 9 Mar 2004 16:48:56 - 1.10
+++ ConcatFilterTest.java 13 May 2004 07:01:49 - 1.11
@@ -21,6 +21,7 @@
import java.io.IOException;
import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.util.FileUtils;
/**
@@ -29,7 +30,8 @@
public class ConcatFilterTest extends BuildFileTest {
private static FileUtils fu = FileUtils.newFileUtils();
-private static final String lSep = System.getProperty("line.separator");
+private static final String lSep =
+Os.isFamily("mac") ? "\r" : System.getProperty("line.separator");
private static final String FILE_PREPEND_WITH =
"this-should-be-the-first-line" + lSep
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Jar.java
bodewig 2004/05/13 00:05:03
Modified:.WHATSNEW
docs/manual/CoreTasks jar.html
src/main/org/apache/tools/ant/taskdefs Jar.java
Log:
Add docs for
Revision ChangesPath
1.605 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.604
retrieving revision 1.605
diff -u -r1.604 -r1.605
--- WHATSNEW 28 Apr 2004 18:08:47 - 1.604
+++ WHATSNEW 13 May 2004 07:05:00 - 1.605
@@ -128,6 +128,10 @@
* JDependTask did not close an output file. Bugzilla Report 28557.
+* can now optionally create an index for jars different than the
+ one it currently builds as well. See the new element
+ for details. Bugzilla Report 14255.
+
Other changes:
--
1.31 +33 -1 ant/docs/manual/CoreTasks/jar.html
Index: jar.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jar.html 27 Feb 2004 14:17:41 - 1.30
+++ jar.html 13 May 2004 07:05:02 - 1.31
@@ -160,7 +160,13 @@
index
-whether to create an http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index";>index
list to speed up classloading. This is a JDK 1.3+ specific feature.
Defaults to false.
+whether to create an http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index";>index
+list to speed up classloading. This is a JDK 1.3+ specific
+feature. Unless you specify additional jars with nested indexjars elements, only the
+contents of this jar will be included in the index. Defaults to
+false.
No
@@ -209,6 +215,32 @@
If the manifest values have changed the jar will be updated or rebuilt, as
appropriate.
+
+indexjars
+
+since ant 1.6.2
+
+The nested indexjars element specifies a PATH like structure. Its content is
+completely ignored unless you set the index attribute of the task to
+true.
+
+The index created by this task will contain indices for the
+archives contained in this path, the names used for the archioves
+depend on your manifest:
+
+ If the generated jar's manifest contains no Class-Path
+ attribute, the file name without any leading directory path will be
+ used and all parts of the path will get indexed.
+ If the manifest contains a Class-Path attribute, this task will
+ try to guess which part of the Class-Path belongs to a given
+ archive. If it cannot guess a name, the archive will be skipped,
+ otherwise tha name listed inside the Class-PAth attribute will be
+ used.
+
+
+This task will not create any index entries for archives that are
+empty or only contain files inside the META-INF directory.
Examples
<jar destfile="${dist}/lib/app.jar"
basedir="${build}/classes"/>
1.87 +4 -4 ant/src/main/org/apache/tools/ant/taskdefs/Jar.java
Index: Jar.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Jar.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- Jar.java 23 Apr 2004 10:03:49 - 1.86
+++ Jar.java 13 May 2004 07:05:02 - 1.87
@@ -126,7 +126,7 @@
/**
* Path containing jars that shall be indexed in addition to this
archive.
*
- * @since Ant 1.7
+ * @since Ant 1.6.2
*/
private Path indexJars;
@@ -320,7 +320,7 @@
}
/**
- * @since Ant 1.7
+ * @since Ant 1.6.2
*/
public void addConfiguredIndexJars(Path p) {
if (indexJars == null) {
@@ -706,7 +706,7 @@
* Writes the directory entries from the first and the filenames
* from the second list to the given writer, one entry per line.
*
- * @since Ant 1.7
+ * @since Ant 1.6.2
*/
protected final void writeIndexLikeList(List dirs, List files,
PrintWriter writer)
@@ -764,7 +764,7 @@
* if there is a classpath and the given file doesn't match any
* of its entries, return null.
*
- * @since Ant 1.7
+ * @since Ant 1.6.2
*/
protected static final String findJarName(String fileName,
String[] classpath) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant DirectoryScanner.java IntrospectionHelper.java ProjectHelper.java
bodewig 2004/05/13 00:06:49
Modified:src/main/org/apache/tools/ant DirectoryScanner.java
IntrospectionHelper.java ProjectHelper.java
Log:
cosmetics
Revision ChangesPath
1.72 +1 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java
Index: DirectoryScanner.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- DirectoryScanner.java 15 Mar 2004 17:33:09 - 1.71
+++ DirectoryScanner.java 13 May 2004 07:06:49 - 1.72
@@ -422,7 +422,7 @@
* @since Ant 1.6
*/
public static void resetDefaultExcludes() {
-defaultExcludes = new Vector();
+defaultExcludes = new Vector();
for (int i = 0; i < DEFAULTEXCLUDES.length; i++) {
defaultExcludes.add(DEFAULTEXCLUDES[i]);
1.80 +4 -4
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- IntrospectionHelper.java 15 Mar 2004 17:33:09 - 1.79
+++ IntrospectionHelper.java 13 May 2004 07:06:49 - 1.80
@@ -414,7 +414,7 @@
return true;
}
-if ("setTaskType".equals(name)
+if ("setTaskType".equals(name)
&& java.lang.String.class.equals(type)) {
return true;
}
@@ -453,7 +453,8 @@
*
* @return a helper for the specified class
*/
-public static synchronized IntrospectionHelper getHelper(Project p,
Class c) {
+public static synchronized IntrospectionHelper getHelper(Project p,
+ Class c) {
IntrospectionHelper ih = (IntrospectionHelper) helpers.get(c);
if (ih == null) {
ih = new IntrospectionHelper(c);
@@ -1113,8 +1114,7 @@
Class elementClass = nestedCreator.getElementClass();
ComponentHelper helper =
ComponentHelper.getComponentHelper(project);
-nestedObject = ComponentHelper.getComponentHelper(project)
-.createComponent(polyType);
+nestedObject = helper.createComponent(polyType);
if (nestedObject == null) {
throw new BuildException(
"Unable to create object of type " + polyType);
1.112 +1 -1 ant/src/main/org/apache/tools/ant/ProjectHelper.java
Index: ProjectHelper.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- ProjectHelper.java15 Mar 2004 17:33:09 - 1.111
+++ ProjectHelper.java13 May 2004 07:06:49 - 1.112
@@ -309,7 +309,7 @@
for (int i = 0; i < attrs.getLength(); i++) {
// reflect these into the target
String value = replaceProperties(project, attrs.getValue(i),
- project.getProperties());
+ project.getProperties());
try {
ih.setAttribute(project, target,
attrs.getName(i).toLowerCase(Locale.US),
value);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs DefaultExcludesTest.java
bodewig 2004/05/13 00:13:53
Modified:.Tag: ANT_16_BRANCH WHATSNEW
docs/manual/CoreTasks Tag: ANT_16_BRANCH jar.html
src/etc/testcases/filters Tag: ANT_16_BRANCH concat.xml
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH
defaultexcludes.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Jar.java
src/testcases/org/apache/tools/ant/filters Tag:
ANT_16_BRANCH ConcatFilterTest.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH DefaultExcludesTest.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.503.2.90 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.89
retrieving revision 1.503.2.90
diff -u -r1.503.2.89 -r1.503.2.90
--- WHATSNEW 28 Apr 2004 11:45:22 - 1.503.2.89
+++ WHATSNEW 13 May 2004 07:13:47 - 1.503.2.90
@@ -122,6 +122,10 @@
run all tests in a single forked JVM reducing the overhead of VM
creation a lot. Bugzilla Report 24697.
+* can now optionally create an index for jars different than the
+ one it currently builds as well. See the new element
+ for details. Bugzilla Report 14255.
+
Changes from Ant 1.6.0 to Ant 1.6.1
===
No revision
No revision
1.28.2.3 +33 -1 ant/docs/manual/CoreTasks/jar.html
Index: jar.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v
retrieving revision 1.28.2.2
retrieving revision 1.28.2.3
diff -u -r1.28.2.2 -r1.28.2.3
--- jar.html 9 Feb 2004 22:12:07 - 1.28.2.2
+++ jar.html 13 May 2004 07:13:50 - 1.28.2.3
@@ -161,7 +161,13 @@
index
-whether to create an http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index";>index
list to speed up classloading. This is a JDK 1.3+ specific feature.
Defaults to false.
+whether to create an http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#JAR%20Index";>index
+list to speed up classloading. This is a JDK 1.3+ specific
+feature. Unless you specify additional jars with nested indexjars elements, only the
+contents of this jar will be included in the index. Defaults to
+false.
No
@@ -196,6 +202,32 @@
If the manifest values have changed the jar will be updated or rebuilt, as
appropriate.
+
+indexjars
+
+since ant 1.6.2
+
+The nested indexjars element specifies a PATH like structure. Its content is
+completely ignored unless you set the index attribute of the task to
+true.
+
+The index created by this task will contain indices for the
+archives contained in this path, the names used for the archioves
+depend on your manifest:
+
+ If the generated jar's manifest contains no Class-Path
+ attribute, the file name without any leading directory path will be
+ used and all parts of the path will get indexed.
+ If the manifest contains a Class-Path attribute, this task will
+ try to guess which part of the Class-Path belongs to a given
+ archive. If it cannot guess a name, the archive will be skipped,
+ otherwise tha name listed inside the Class-PAth attribute will be
+ used.
+
+
+This task will not create any index entries for archives that are
+empty or only contain files inside the META-INF directory.
Examples
<jar destfile="${dist}/lib/app.jar"
basedir="${build}/classes"/>
No revision
No revision
1.2.2.3 +2 -0 ant/src/etc/testcases/filters/concat.xml
Index: concat.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/filters/concat.xml,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- concat.xml25 Sep 2003 06:19:51 - 1.2.2.2
+++ concat.xml13 May 2004 07:13:51 - 1.2.2.3
@@ -7,6 +7,8 @@
+
+
No revision
No revision
1.2.2.1 +4 -0 ant/src/etc/testcases/taskdefs/defaultexcludes.xml
Index: defaultexcludes.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/defaultexcludes.xml,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- defaultexcludes.xml 21 Jul 2003 10:52:19 - 1.2
+++ defau
cvs commit: ant/src/main/org/apache/tools/ant/util XMLFragment.java
bodewig 2004/05/24 23:23:17
Modified:src/main/org/apache/tools/ant IntrospectionHelper.java
src/main/org/apache/tools/ant/util XMLFragment.java
Log:
temporary fix until Peter adds DynamicConfiguratorNS
Revision ChangesPath
1.82 +46 -45
ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
Index: IntrospectionHelper.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- IntrospectionHelper.java 24 May 2004 15:09:54 - 1.81
+++ IntrospectionHelper.java 25 May 2004 06:23:17 - 1.82
@@ -489,20 +489,21 @@
= (AttributeSetter) attributeSetters.get(
attributeName.toLowerCase(Locale.US));
if (as == null) {
-if (element instanceof DynamicConfiguratorNS) {
-DynamicConfiguratorNS dc = (DynamicConfiguratorNS) element;
-String uriPlusPrefix =
-ProjectHelper.extractUriFromComponentName(attributeName);
-String uri =
-ProjectHelper.extractUriFromComponentName(uriPlusPrefix);
-String localName =
-
ProjectHelper.extractNameFromComponentName(attributeName);
-String qName = ("".equals(uri)
-? localName : (uri + ":" + localName));
-
-dc.setDynamicAttribute(uri, localName, qName, value);
-return;
-} else if (element instanceof DynamicConfigurator) {
+//if (element instanceof DynamicConfiguratorNS) {
+//DynamicConfiguratorNS dc = (DynamicConfiguratorNS) element;
+//String uriPlusPrefix =
+//
ProjectHelper.extractUriFromComponentName(attributeName);
+//String uri =
+//
ProjectHelper.extractUriFromComponentName(uriPlusPrefix);
+//String localName =
+//
ProjectHelper.extractNameFromComponentName(attributeName);
+//String qName = ("".equals(uri)
+//? localName : (uri + ":" + localName));
+//
+//dc.setDynamicAttribute(uri, localName, qName, value);
+//return;
+//} else
+if (element instanceof DynamicConfigurator) {
DynamicConfigurator dc = (DynamicConfigurator) element;
dc.setDynamicAttribute(attributeName.toLowerCase(Locale.US),
value);
return;
@@ -611,35 +612,35 @@
if (nc == null) {
nc = createAddTypeCreator(project, parent, elementName);
}
-if (nc == null && parent instanceof DynamicConfiguratorNS) {
-DynamicConfiguratorNS dc = (DynamicConfiguratorNS) parent;
-String qName = (child == null ? name : child.getQName());
-final Object nestedElement =
-dc.createDynamicElement(
-(child == null ? "" : child.getNamespace()),
-name, qName);
-if (nestedElement != null) {
-nc = new NestedCreator() {
-public boolean isPolyMorphic() {
-return false;
-}
-public Class getElementClass() {
-return null;
-}
-
-public Object getRealObject() {
-return null;
-}
-
-public Object create(
-Project project, Object parent, Object ignore) {
-return nestedElement;
-}
-public void store(Object parent, Object child) {
-}
-};
-}
-}
+//if (nc == null && parent instanceof DynamicConfiguratorNS) {
+//DynamicConfiguratorNS dc = (DynamicConfiguratorNS) parent;
+//String qName = (child == null ? name : child.getQName());
+//final Object nestedElement =
+//dc.createDynamicElement(
+//(child == null ? "" : child.getNamespace()),
+//name, qName);
+//if (nestedElement != null) {
+//nc = new NestedCreator() {
+//public boolean isPolyMorphic() {
+//return false;
+//}
+//public Class getElementClass() {
+//return null;
+//}
+//
+//
cvs commit: ant build.xml
bodewig 2004/05/25 04:36:40 Modified:.build.xml Log: Use the same class as JavaEnvUtils to check for 1.5+ Revision ChangesPath 1.421 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.420 retrieving revision 1.421 diff -u -r1.420 -r1.421 --- build.xml 20 May 2004 08:34:13 - 1.420 +++ build.xml 25 May 2004 11:36:40 - 1.421 @@ -392,7 +392,7 @@ - +
cvs commit: ant build.xml
bodewig 2004/05/25 04:37:02 Modified:.Tag: ANT_16_BRANCH build.xml Log: merge Revision ChangesPath No revision No revision 1.392.2.28 +1 -1 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.27 retrieving revision 1.392.2.28 diff -u -r1.392.2.27 -r1.392.2.28 --- build.xml 20 May 2004 08:34:32 - 1.392.2.27 +++ build.xml 25 May 2004 11:37:02 - 1.392.2.28 @@ -391,7 +391,7 @@ - +
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2004/05/25 04:48:20 Modified:.WHATSNEW docs/manual/CoreTasks ear.html jar.html war.html zip.html src/main/org/apache/tools/ant/taskdefs Zip.java Log: Push fix for PR#17934 to 1.6.2 Revision ChangesPath 1.608 +5 -6 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.607 retrieving revision 1.608 diff -u -r1.607 -r1.608 --- WHATSNEW 18 May 2004 09:03:33 - 1.607 +++ WHATSNEW 25 May 2004 11:48:19 - 1.608 @@ -16,12 +16,6 @@ * Enable to choose the regexp implementation without system property. Bugzilla Report 15390. -* A new roundup attribute on and related task can be used to - control whether the file modification times inside the archive will - be rounded up or down (since zips only store modification times with - a granularity of two seconds). The default remains to round up. - Bugzilla Report 17934. - * Nested file mappers and a container mapper implementation have been introduced. Additionally, the element now accepts "defined" nested FileNameMapper implementations directly, allowing a usage @@ -185,6 +179,11 @@ * Ignore built distributions. Bugzilla Report 28997. +* A new roundup attribute on and related task can be used to + control whether the file modification times inside the archive will + be rounded up or down (since zips only store modification times with + a granularity of two seconds). The default remains to round up. + Bugzilla Report 17934. Changes from Ant 1.6.0 to Ant 1.6.1 = 1.19 +1 -1 ant/docs/manual/CoreTasks/ear.html Index: ear.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/ear.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- ear.html 27 Feb 2004 14:17:41 - 1.18 +++ ear.html 25 May 2004 11:48:20 - 1.19 @@ -125,7 +125,7 @@ lead to a different type of problems like JSPs inside a web archive that seem to be slightly more recent than precompiled pages, rendering precompilation useless. -Defaults to true. Since Ant 1.7 +Defaults to true. Since Ant 1.6.2 No 1.32 +1 -1 ant/docs/manual/CoreTasks/jar.html Index: jar.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- jar.html 13 May 2004 07:05:02 - 1.31 +++ jar.html 25 May 2004 11:48:20 - 1.32 @@ -185,7 +185,7 @@ lead to a different type of problems like JSPs inside a web archive that seem to be slightly more recent than precompiled pages, rendering precompilation useless. -Defaults to true. Since Ant 1.7 +Defaults to true. Since Ant 1.6.2 No 1.23 +1 -1 ant/docs/manual/CoreTasks/war.html Index: war.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/war.html,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- war.html 27 Feb 2004 14:17:41 - 1.22 +++ war.html 25 May 2004 11:48:20 - 1.23 @@ -132,7 +132,7 @@ lead to a different type of problems like JSPs inside a web archive that seem to be slightly more recent than precompiled pages, rendering precompilation useless. -Defaults to true. Since Ant 1.7 +Defaults to true. Since Ant 1.6.2 No 1.25 +1 -1 ant/docs/manual/CoreTasks/zip.html Index: zip.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/zip.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- zip.html 27 Feb 2004 14:17:41 - 1.24 +++ zip.html 25 May 2004 11:48:20 - 1.25 @@ -175,7 +175,7 @@ lead to a different type of problems like JSPs inside a web archive that seem to be slightly more recent than precompiled pages, rendering precompilation useless. -Defaults to true. Since Ant 1.7 +Defaults to true. Since Ant 1.6.2 No 1.125 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java Index: Zip.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- Zip.java 16 Apr 2004 09:35:21 -
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
bodewig 2004/05/25 04:48:35 Modified:.Tag: ANT_16_BRANCH WHATSNEW docs/manual/CoreTasks Tag: ANT_16_BRANCH ear.html jar.html war.html zip.html src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH Zip.java Log: Merge fix for PR#17934 Revision ChangesPath No revision No revision 1.503.2.92 +5 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.91 retrieving revision 1.503.2.92 diff -u -r1.503.2.91 -r1.503.2.92 --- WHATSNEW 18 May 2004 09:04:27 - 1.503.2.91 +++ WHATSNEW 25 May 2004 11:48:34 - 1.503.2.92 @@ -149,6 +149,11 @@ * Ignore built distributions. Bugzilla Report 28997. +* A new roundup attribute on and related task can be used to + control whether the file modification times inside the archive will + be rounded up or down (since zips only store modification times with + a granularity of two seconds). The default remains to round up. + Bugzilla Report 17934. Changes from Ant 1.6.0 to Ant 1.6.1 = No revision No revision 1.16.2.3 +14 -0 ant/docs/manual/CoreTasks/ear.html Index: ear.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/ear.html,v retrieving revision 1.16.2.2 retrieving revision 1.16.2.3 diff -u -r1.16.2.2 -r1.16.2.3 --- ear.html 9 Feb 2004 22:12:07 - 1.16.2.2 +++ ear.html 25 May 2004 11:48:35 - 1.16.2.3 @@ -115,6 +115,20 @@ behavior when a duplicate file is found. Valid values are "add", "preserve", and "fail". The default value is "add". No + +roundup +Whether the file modification times will be +rounded up to the next even number of seconds. +Zip archives store file modification times with a granularity of +two seconds, so the times will either be rounded up or down. If +you round down, the archive will always seem out-of-date when you +rerun the task, so the default is to round up. Rounding up may +lead to a different type of problems like JSPs inside a web +archive that seem to be slightly more recent than precompiled +pages, rendering precompilation useless. +Defaults to true. Since Ant 1.6.2 +No + Nested elements metainf 1.28.2.4 +14 -0 ant/docs/manual/CoreTasks/jar.html Index: jar.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/jar.html,v retrieving revision 1.28.2.3 retrieving revision 1.28.2.4 diff -u -r1.28.2.3 -r1.28.2.4 --- jar.html 13 May 2004 07:13:50 - 1.28.2.3 +++ jar.html 25 May 2004 11:48:35 - 1.28.2.4 @@ -175,6 +175,20 @@ The encoding used to read the JAR manifest, when a manifest file is specified. No, defaults to the platform encoding. + +roundup +Whether the file modification times will be +rounded up to the next even number of seconds. +Zip archives store file modification times with a granularity of +two seconds, so the times will either be rounded up or down. If +you round down, the archive will always seem out-of-date when you +rerun the task, so the default is to round up. Rounding up may +lead to a different type of problems like JSPs inside a web +archive that seem to be slightly more recent than precompiled +pages, rendering precompilation useless. +Defaults to true. Since Ant 1.6.2 +No + Nested elements 1.20.2.3 +14 -0 ant/docs/manual/CoreTasks/war.html Index: war.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/war.html,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -r1.20.2.2 -r1.20.2.3 --- war.html 9 Feb 2004 22:12:07 - 1.20.2.2 +++ war.html 25 May 2004 11:48:35 - 1.20.2.3 @@ -122,6 +122,20 @@ behavior when a duplicate file is found. Valid values are "add", "preserve", and "fail". The default value is "add". No + +roundup +Whether the file modification times will be +rounded up to the next even number of seconds. +Zip archives store file modification times with a granularity of +two seconds, so the times will either be rounded up or down. If +you round down, the archive will always seem out-of-date when you +rerun the task, so the default is to round up.
cvs commit: ant/src/main/org/apache/tools/ant/util ResourceUtils.java SourceFileScanner.java
bodewig 2004/05/25 05:12:39
Modified:docs/manual/CoreTasks copy.html
src/main/org/apache/tools/ant/taskdefs Copy.java
src/main/org/apache/tools/ant/util ResourceUtils.java
SourceFileScanner.java
Log:
Push fix for PR#22150 to 1.6.2
Revision ChangesPath
1.25 +1 -1 ant/docs/manual/CoreTasks/copy.html
Index: copy.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- copy.html 9 Feb 2004 21:50:05 - 1.24
+++ copy.html 25 May 2004 12:12:39 - 1.25
@@ -136,7 +136,7 @@
millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
systems. This can also be useful if source and target files live
on separate machines with clocks being out of sync. since Ant
-1.6.
+1.6.2.
Parameters specified as nested elements
1.72 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
Index: Copy.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Copy.java 9 Mar 2004 16:48:04 - 1.71
+++ Copy.java 25 May 2004 12:12:39 - 1.72
@@ -335,7 +335,7 @@
*
* Default is 0 milliseconds, or 2 seconds on DOS systems.
*
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public void setGranularity(long granularity) {
this.granularity = granularity;
1.10 +1 -1 ant/src/main/org/apache/tools/ant/util/ResourceUtils.java
Index: ResourceUtils.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ResourceUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceUtils.java9 Mar 2004 16:48:52 - 1.9
+++ ResourceUtils.java25 May 2004 12:12:39 - 1.10
@@ -71,7 +71,7 @@
* @return array containing the source files which need to be
* copied or processed, because the targets are out of date or do
* not exist
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public static Resource[] selectOutOfDateSources(ProjectComponent logTo,
Resource[] source,
1.27 +2 -2
ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java
Index: SourceFileScanner.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SourceFileScanner.java9 Mar 2004 16:48:52 - 1.26
+++ SourceFileScanner.java25 May 2004 12:12:39 - 1.27
@@ -77,7 +77,7 @@
* @param granularity The number of milliseconds leeway to give
*before deciding a target is out of date.
*
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public String[] restrict(String[] files, File srcDir, File destDir,
FileNameMapper mapper, long granularity) {
@@ -120,7 +120,7 @@
* files as File objects (containing absolute paths if srcDir is
* absolute).
*
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public File[] restrictAsFiles(String[] files, File srcDir, File destDir,
FileNameMapper mapper, long granularity) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util ResourceUtils.java SourceFileScanner.java
bodewig 2004/05/25 05:12:57
Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH copy.html
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Copy.java
src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH
ResourceUtils.java SourceFileScanner.java
Log:
Merge fix for PR#22150
Revision ChangesPath
No revision
No revision
1.19.2.6 +10 -0 ant/docs/manual/CoreTasks/copy.html
Index: copy.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -r1.19.2.5 -r1.19.2.6
--- copy.html 9 Feb 2004 22:12:07 - 1.19.2.5
+++ copy.html 25 May 2004 12:12:56 - 1.19.2.6
@@ -129,6 +129,16 @@
since Ant 1.6.
No - defaults to false.
+
+granularity
+The number of milliseconds leeway to give before
+deciding a file is out of date. This is needed because not every
+file system supports tracking the last modified time to the
+millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
+systems. This can also be useful if source and target files live
+on separate machines with clocks being out of sync. since Ant
+1.6.2.
+
Parameters specified as nested elements
No revision
No revision
1.66.2.5 +18 -3 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
Index: Copy.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.66.2.4
retrieving revision 1.66.2.5
diff -u -r1.66.2.4 -r1.66.2.5
--- Copy.java 9 Mar 2004 17:01:33 - 1.66.2.4
+++ Copy.java 25 May 2004 12:12:56 - 1.66.2.5
@@ -78,12 +78,14 @@
private FileUtils fileUtils;
private String inputEncoding = null;
private String outputEncoding = null;
+private long granularity = 0;
/**
* Copy task constructor.
*/
public Copy() {
fileUtils = FileUtils.newFileUtils();
+granularity = fileUtils.getFileTimestampGranularity();
}
/**
@@ -328,6 +330,18 @@
}
/**
+ * The number of milliseconds leeway to give before deciding a
+ * target is out of date.
+ *
+ * Default is 0 milliseconds, or 2 seconds on DOS systems.
+ *
+ * @since Ant 1.6.2
+ */
+public void setGranularity(long granularity) {
+this.granularity = granularity;
+}
+
+/**
* Performs the copy operation.
* @exception BuildException if an error occurs
*/
@@ -354,7 +368,8 @@
}
if (forceOverwrite || !destFile.exists()
-|| (file.lastModified() > destFile.lastModified())) {
+|| (file.lastModified() - granularity
+> destFile.lastModified())) {
fileCopyMap.put(file.getAbsolutePath(),
new String[]
{destFile.getAbsolutePath()});
} else {
@@ -540,7 +555,7 @@
v.copyInto(toCopy);
} else {
SourceFileScanner ds = new SourceFileScanner(this);
-toCopy = ds.restrict(names, fromDir, toDir, mapper);
+toCopy = ds.restrict(names, fromDir, toDir, mapper, granularity);
}
for (int i = 0; i < toCopy.length; i++) {
No revision
No revision
1.4.2.5 +33 -15ant/src/main/org/apache/tools/ant/util/ResourceUtils.java
Index: ResourceUtils.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ResourceUtils.java,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- ResourceUtils.java9 Mar 2004 17:01:57 - 1.4.2.4
+++ ResourceUtils.java25 May 2004 12:12:57 - 1.4.2.5
@@ -21,6 +21,7 @@
import org.apache.tools.ant.taskdefs.condition.Os;
import org.apache.tools.ant.types.Resource;
import org.apache.tools.ant.types.ResourceFactory;
+import org.apache.tools.ant.types.selectors.SelectorUtils;
import java.io.File;
import java.util.Vector;
@@ -32,7 +33,7 @@
*/
public class ResourceUtils {
-/**
{
+/**
* tells which source files should be reprocessed based on the
* last modification date of target files
* @param logTo where to send (more or less) interesti
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Sync.java
bodewig 2004/05/25 05:14:04
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Sync.java
Log:
Merge fix for PR#22150
Revision ChangesPath
No revision
No revision
1.7.2.5 +13 -1 ant/src/main/org/apache/tools/ant/taskdefs/Sync.java
Index: Sync.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sync.java,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -r1.7.2.4 -r1.7.2.5
--- Sync.java 9 Mar 2004 17:01:34 - 1.7.2.4
+++ Sync.java 25 May 2004 12:14:03 - 1.7.2.5
@@ -285,6 +285,18 @@
}
/**
+ * The number of milliseconds leeway to give before deciding a
+ * target is out of date.
+ *
+ * Default is 0 milliseconds, or 2 seconds on DOS systems.
+ *
+ * @since Ant 1.6.2
+ */
+public void setGranularity(long granularity) {
+_copy.setGranularity(granularity);
+}
+
+/**
* Subclass Copy in order to access it's file/dir maps.
*/
public static class MyCopy extends Copy {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Sync.java
bodewig 2004/05/25 05:14:07
Modified:src/main/org/apache/tools/ant/taskdefs Sync.java
Log:
Push fix for PR#22150 to 1.6.2
Revision ChangesPath
1.13 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Sync.java
Index: Sync.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Sync.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Sync.java 9 Mar 2004 16:48:06 - 1.12
+++ Sync.java 25 May 2004 12:14:07 - 1.13
@@ -290,7 +290,7 @@
*
* Default is 0 milliseconds, or 2 seconds on DOS systems.
*
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public void setGranularity(long granularity) {
_copy.setGranularity(granularity);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ProcessDestroyer.java
bodewig 2004/05/27 00:06:27
Modified:src/main/org/apache/tools/ant/taskdefs ProcessDestroyer.java
Log:
Don't try to add or remove shutdown hooks while the hook is running. Remove
a processes.wait that won't ever return as far as I can tell.
Revision ChangesPath
1.17 +35 -27
ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
Index: ProcessDestroyer.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ProcessDestroyer.java 9 Mar 2004 16:48:06 - 1.16
+++ ProcessDestroyer.java 27 May 2004 07:06:27 - 1.17
@@ -38,6 +38,9 @@
// whether or not this ProcessDestroyer has been registered as a
// shutdown hook
private boolean added = false;
+// whether or not this ProcessDestroyer is currently running as
+// shutdown hook
+private boolean running = false;
private class ProcessDestroyerImpl extends Thread {
private boolean shouldDestroy = true;
@@ -89,7 +92,7 @@
* uses reflection to ensure pre-JDK 1.3 compatibility.
*/
private void addShutdownHook() {
-if (addShutdownHookMethod != null) {
+if (addShutdownHookMethod != null && !running) {
destroyProcessThread = new ProcessDestroyerImpl();
Object[] args = {destroyProcessThread};
try {
@@ -98,7 +101,13 @@
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-e.printStackTrace();
+Throwable t = e.getCause();
+if (t != null && t.getClass() ==
IllegalStateException.class) {
+// shutdown already is in progress
+running = true;
+} else {
+e.printStackTrace();
+}
}
}
}
@@ -108,7 +117,7 @@
* uses reflection to ensure pre-JDK 1.3 compatibility
*/
private void removeShutdownHook() {
-if (removeShutdownHookMethod != null && destroyProcessThread !=
null) {
+if (removeShutdownHookMethod != null && added && !running) {
Object[] args = {destroyProcessThread};
try {
Boolean removed =
@@ -118,25 +127,31 @@
if (!removed.booleanValue()) {
System.err.println("Could not remove shutdown hook");
}
-// start the hook thread, a unstarted thread may not be
-// eligible for garbage collection
-// Cf.:
http://developer.java.sun.com/developer/bugParade/bugs/4533087.html
-destroyProcessThread.setShouldDestroy(false);
-destroyProcessThread.start();
-// this should return quickly, since Process.destroy()
-try {
-destroyProcessThread.join(2);
-} catch (InterruptedException ie) {
-// the thread didn't die in time
-// it should not kill any processes unexpectedly
-}
-destroyProcessThread = null;
-added = false;
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-e.printStackTrace();
+Throwable t = e.getCause();
+if (t != null && t.getClass() ==
IllegalStateException.class) {
+// shutdown already is in progress
+running = true;
+} else {
+e.printStackTrace();
+}
}
+// start the hook thread, a unstarted thread may not be
+// eligible for garbage collection
+// Cf.:
http://developer.java.sun.com/developer/bugParade/bugs/4533087.html
+destroyProcessThread.setShouldDestroy(false);
+destroyProcessThread.start();
+// this should return quickly, since it basically is a NO-OP.
+try {
+destroyProcessThread.join(2);
+} catch (InterruptedException ie) {
+// the thread didn't die in time
+// it should not kill any processes unexpectedly
+}
+destroyProcessThread = null;
+added = false;
}
}
@@ -179,8 +194,7 @@
public boolean remove(Process process) {
synchronized (processes) {
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ProcessDestroyer.java
bodewig 2004/06/01 06:30:54
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ProcessDestroyer.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.11.2.6 +35 -27
ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
Index: ProcessDestroyer.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- ProcessDestroyer.java 9 Mar 2004 17:01:34 - 1.11.2.5
+++ ProcessDestroyer.java 1 Jun 2004 13:30:54 - 1.11.2.6
@@ -38,6 +38,9 @@
// whether or not this ProcessDestroyer has been registered as a
// shutdown hook
private boolean added = false;
+// whether or not this ProcessDestroyer is currently running as
+// shutdown hook
+private boolean running = false;
private class ProcessDestroyerImpl extends Thread {
private boolean shouldDestroy = true;
@@ -89,7 +92,7 @@
* uses reflection to ensure pre-JDK 1.3 compatibility.
*/
private void addShutdownHook() {
-if (addShutdownHookMethod != null) {
+if (addShutdownHookMethod != null && !running) {
destroyProcessThread = new ProcessDestroyerImpl();
Object[] args = {destroyProcessThread};
try {
@@ -98,7 +101,13 @@
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-e.printStackTrace();
+Throwable t = e.getCause();
+if (t != null && t.getClass() ==
IllegalStateException.class) {
+// shutdown already is in progress
+running = true;
+} else {
+e.printStackTrace();
+}
}
}
}
@@ -108,7 +117,7 @@
* uses reflection to ensure pre-JDK 1.3 compatibility
*/
private void removeShutdownHook() {
-if (removeShutdownHookMethod != null && destroyProcessThread !=
null) {
+if (removeShutdownHookMethod != null && added && !running) {
Object[] args = {destroyProcessThread};
try {
Boolean removed =
@@ -118,25 +127,31 @@
if (!removed.booleanValue()) {
System.err.println("Could not remove shutdown hook");
}
-// start the hook thread, a unstarted thread may not be
-// eligible for garbage collection
-// Cf.:
http://developer.java.sun.com/developer/bugParade/bugs/4533087.html
-destroyProcessThread.setShouldDestroy(false);
-destroyProcessThread.start();
-// this should return quickly, since Process.destroy()
-try {
-destroyProcessThread.join(2);
-} catch (InterruptedException ie) {
-// the thread didn't die in time
-// it should not kill any processes unexpectedly
-}
-destroyProcessThread = null;
-added = false;
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-e.printStackTrace();
+Throwable t = e.getCause();
+if (t != null && t.getClass() ==
IllegalStateException.class) {
+// shutdown already is in progress
+running = true;
+} else {
+e.printStackTrace();
+}
}
+// start the hook thread, a unstarted thread may not be
+// eligible for garbage collection
+// Cf.:
http://developer.java.sun.com/developer/bugParade/bugs/4533087.html
+destroyProcessThread.setShouldDestroy(false);
+destroyProcessThread.start();
+// this should return quickly, since it basically is a NO-OP.
+try {
+destroyProcessThread.join(2);
+} catch (InterruptedException ie) {
+// the thread didn't die in time
+// it should not kill any processes unexpectedly
+}
+destroyProcessThread = null;
+added = false;
}
}
@@ -179,8 +194,7 @@
public boolean remove(Process process) {
synchronized (processes) {
boolean processRemoved =
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ProcessDestroyer.java
bodewig 2004/06/01 06:33:10
Modified:src/main/org/apache/tools/ant/taskdefs ProcessDestroyer.java
Log:
JDK 1.3-
Revision ChangesPath
1.18 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
Index: ProcessDestroyer.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ProcessDestroyer.java 27 May 2004 07:06:27 - 1.17
+++ ProcessDestroyer.java 1 Jun 2004 13:33:10 - 1.18
@@ -101,7 +101,7 @@
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-Throwable t = e.getCause();
+Throwable t = e.getTargetException();
if (t != null && t.getClass() ==
IllegalStateException.class) {
// shutdown already is in progress
running = true;
@@ -130,7 +130,7 @@
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-Throwable t = e.getCause();
+Throwable t = e.getTargetException();
if (t != null && t.getClass() ==
IllegalStateException.class) {
// shutdown already is in progress
running = true;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs ProcessDestroyer.java
bodewig 2004/06/01 06:33:25
Modified:src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
ProcessDestroyer.java
Log:
merge
Revision ChangesPath
No revision
No revision
1.11.2.7 +2 -2
ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java
Index: ProcessDestroyer.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ProcessDestroyer.java,v
retrieving revision 1.11.2.6
retrieving revision 1.11.2.7
diff -u -r1.11.2.6 -r1.11.2.7
--- ProcessDestroyer.java 1 Jun 2004 13:30:54 - 1.11.2.6
+++ ProcessDestroyer.java 1 Jun 2004 13:33:25 - 1.11.2.7
@@ -101,7 +101,7 @@
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-Throwable t = e.getCause();
+Throwable t = e.getTargetException();
if (t != null && t.getClass() ==
IllegalStateException.class) {
// shutdown already is in progress
running = true;
@@ -130,7 +130,7 @@
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
-Throwable t = e.getCause();
+Throwable t = e.getTargetException();
if (t != null && t.getClass() ==
IllegalStateException.class) {
// shutdown already is in progress
running = true;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant build.xml WHATSNEW
bodewig 2004/06/02 05:09:46 Modified:.build.xml WHATSNEW Log: Xalan2Executor doesn't need Xalan-J 2 Revision ChangesPath 1.422 +1 -7 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.421 retrieving revision 1.422 diff -u -r1.421 -r1.422 --- build.xml 25 May 2004 11:36:40 - 1.421 +++ build.xml 2 Jun 2004 12:09:45 - 1.422 @@ -172,6 +172,7 @@ + @@ -187,10 +188,6 @@ - - - - @@ -642,7 +639,6 @@ - @@ -820,7 +816,6 @@ - @@ -868,7 +863,6 @@ - 1.610 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.609 retrieving revision 1.610 diff -u -r1.609 -r1.610 --- WHATSNEW 31 May 2004 08:21:02 - 1.609 +++ WHATSNEW 2 Jun 2004 12:09:45 - 1.610 @@ -37,6 +37,10 @@ * The import task used the canonical version of a file path. This has been changed to use the absolute path. Bugzilla 28505. +* ant-xalan2.jar has been removed since the only class contained in it + didn't depend on Xalan-J 2 at all. Its sole dependency has always + been TraX and so it has been merged into ant-trax.jar. + Fixed bugs: --- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW build.xml
bodewig 2004/06/02 05:10:59 Modified:.Tag: ANT_16_BRANCH WHATSNEW build.xml Log: merge Revision ChangesPath No revision No revision 1.503.2.94 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.93 retrieving revision 1.503.2.94 diff -u -r1.503.2.93 -r1.503.2.94 --- WHATSNEW 31 May 2004 08:24:30 - 1.503.2.93 +++ WHATSNEW 2 Jun 2004 12:10:58 - 1.503.2.94 @@ -7,6 +7,10 @@ * The import task used the canonical version of a file path. This has been changed to use the absolute path. Bugzilla 28505. +* ant-xalan2.jar has been removed since the only class contained in it + didn't depend on Xalan-J 2 at all. Its sole dependency has always + been TraX and so it has been merged into ant-trax.jar. + Fixed bugs: --- 1.392.2.29 +1 -7 ant/build.xml Index: build.xml === RCS file: /home/cvs/ant/build.xml,v retrieving revision 1.392.2.28 retrieving revision 1.392.2.29 diff -u -r1.392.2.28 -r1.392.2.29 --- build.xml 25 May 2004 11:37:02 - 1.392.2.28 +++ build.xml 2 Jun 2004 12:10:59 - 1.392.2.29 @@ -171,6 +171,7 @@ + @@ -186,10 +187,6 @@ - - - - @@ -641,7 +638,6 @@ - @@ -819,7 +815,6 @@ - @@ -867,7 +862,6 @@ - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs faq.xml
bodewig 2004/06/02 05:31:18
Modified:docs faq.html
docs/manual/OptionalTasks junitreport.html
src/main/org/apache/tools/ant/taskdefs/optional/junit
XalanExecutor.java
xdocsfaq.xml
Log:
Document the /JDK 1.5 problem, PR: 27541
Revision ChangesPath
1.99 +21 -0 ant/docs/faq.html
Index: faq.html
===
RCS file: /home/cvs/ant/docs/faq.html,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- faq.html 11 May 2004 16:37:02 - 1.98
+++ faq.html 2 Jun 2004 12:31:17 - 1.99
@@ -357,6 +357,12 @@
NoClassDefFoundError if forked.
+
+
+<junitreport> doesn't work with JDK 1.5 but
+worked fine with JDK 1.4.
+
+
Answers
@@ -1674,6 +1680,21 @@
<pathelement
path="${ant.home}/lib/xml-apis.jar:${ant.home}/lib/xercesImpl.jar"/>
to your task's <classpath>.
+
+
+
+<junitreport> doesn't work with JDK 1.5 but
+worked fine with JDK 1.4.
+
+
+ While JDK 1.4.x contains a version of Xalan-J 2, JDK 1.5
+(and later?) have http://java.sun.com/j2se/1.5.0/compatibility.html#4959783";>moved
+to XSLTC. Since this task uses Xalan's redirect
+extensions for its internal stylesheet, Ant doesn't support
+XSLTC yet. This means that you have to install http://xml.apache.org/xalan-j/";>Xalan-J 2 in order
+to use this task with JDK 1.5.
+If you want to follow progress on this, http://issues.apache.org/bugzilla/show_bug.cgi?id=27541";>here
+is the relevant bug report.
1.13 +11 -5 ant/docs/manual/OptionalTasks/junitreport.html
Index: junitreport.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junitreport.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- junitreport.html 9 Feb 2004 21:50:08 - 1.12
+++ junitreport.html 2 Jun 2004 12:31:18 - 1.13
@@ -14,11 +14,17 @@
Library Dependencies for more information.
Requirements
-The task needs http://xml.apache.org/xalan-j/";>Xalan 2.x;
-although
-http://xml.apache.org/dist/xalan-j/old/xalan-j_1_2_2.zip";>Xalan
1.2.2
-does work, but as Xalan1 is not supported, we do not recommend this.
-
+The task needs http://xml.apache.org/xalan-j/";>Xalan
+2.x; although http://xml.apache.org/dist/xalan-j/old/xalan-j_1_2_2.zip";>Xalan
+1.2.2 does work, but as Xalan1 is not supported, we do not
+recommend this. While JDK 1.4.x contains a version of Xalan-J 2, JDK
+1.5 and later have http://java.sun.com/j2se/1.5.0/compatibility.html#4959783";>moved
+to XSLTC. Since this task uses Xalan's redirect extensions for
+its internal stylesheet, Ant doesn't support XSLTC yet. This means
+that you have to install Xalan-J 2 in order to use this task with JDK
+1.5.
If you do you use Xalan 1.2.2 you will need a compatible (older) version of
Xerces.
as well as BSF(bsf.jar). Again, using Xalan 2 is simpler and supported.
1.15 +12 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
Index: XalanExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XalanExecutor.java9 Feb 2004 21:05:32 - 1.14
+++ XalanExecutor.java2 Jun 2004 12:31:18 - 1.15
@@ -27,6 +27,7 @@
import java.lang.reflect.Field;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* Command class that encapsulate specific behavior for each
@@ -86,8 +87,17 @@
xalan1missing.printStackTrace(new PrintWriter(swr));
caller.task.log("Didn't find Xalan1.", Project.MSG_DEBUG);
caller.task.log(swr.toString(), Project.MSG_DEBUG);
-throw new BuildException("Could not find xalan2 nor xalan1 "
-+ "in the classpath. Check
http://xml.apache.org/xalan-j";);
+String msg = "Could not find xalan2 nor xalan1 "
++ "in the classpath. Check
cvs commit: ant/xdocs faq.xml
bodewig 2004/06/02 05:33:21
Modified:docs Tag: ANT_16_BRANCH faq.html
docs/manual/OptionalTasks Tag: ANT_16_BRANCH
junitreport.html
src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH XalanExecutor.java
xdocsTag: ANT_16_BRANCH faq.xml
Log:
merge
Revision ChangesPath
No revision
No revision
1.77.2.13 +21 -0 ant/docs/faq.html
Index: faq.html
===
RCS file: /home/cvs/ant/docs/faq.html,v
retrieving revision 1.77.2.12
retrieving revision 1.77.2.13
diff -u -r1.77.2.12 -r1.77.2.13
--- faq.html 20 Apr 2004 07:29:35 - 1.77.2.12
+++ faq.html 2 Jun 2004 12:33:21 - 1.77.2.13
@@ -351,6 +351,12 @@
NoClassDefFoundError if forked.
+
+
+<junitreport> doesn't work with JDK 1.5 but
+worked fine with JDK 1.4.
+
+
Answers
@@ -1650,6 +1656,21 @@
<pathelement
path="${ant.home}/lib/xml-apis.jar:${ant.home}/lib/xercesImpl.jar"/>
to your task's <classpath>.
+
+
+
+<junitreport> doesn't work with JDK 1.5 but
+worked fine with JDK 1.4.
+
+
+ While JDK 1.4.x contains a version of Xalan-J 2, JDK 1.5
+(and later?) have http://java.sun.com/j2se/1.5.0/compatibility.html#4959783";>moved
+to XSLTC. Since this task uses Xalan's redirect
+extensions for its internal stylesheet, Ant doesn't support
+XSLTC yet. This means that you have to install http://xml.apache.org/xalan-j/";>Xalan-J 2 in order
+to use this task with JDK 1.5.
+If you want to follow progress on this, http://issues.apache.org/bugzilla/show_bug.cgi?id=27541";>here
+is the relevant bug report.
No revision
No revision
1.11.2.3 +11 -5 ant/docs/manual/OptionalTasks/junitreport.html
Index: junitreport.html
===
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/junitreport.html,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- junitreport.html 9 Feb 2004 22:12:11 - 1.11.2.2
+++ junitreport.html 2 Jun 2004 12:33:21 - 1.11.2.3
@@ -15,11 +15,17 @@
Library Dependencies for more information.
Requirements
-The task needs http://xml.apache.org/xalan-j/";>Xalan 2.x;
-although
-http://xml.apache.org/dist/xalan-j/old/xalan-j_1_2_2.zip";>Xalan
1.2.2
-does work, but as Xalan1 is not supported, we do not recommend this.
-
+The task needs http://xml.apache.org/xalan-j/";>Xalan
+2.x; although http://xml.apache.org/dist/xalan-j/old/xalan-j_1_2_2.zip";>Xalan
+1.2.2 does work, but as Xalan1 is not supported, we do not
+recommend this. While JDK 1.4.x contains a version of Xalan-J 2, JDK
+1.5 and later have http://java.sun.com/j2se/1.5.0/compatibility.html#4959783";>moved
+to XSLTC. Since this task uses Xalan's redirect extensions for
+its internal stylesheet, Ant doesn't support XSLTC yet. This means
+that you have to install Xalan-J 2 in order to use this task with JDK
+1.5.
If you do you use Xalan 1.2.2 you will need a compatible (older) version of
Xerces.
as well as BSF(bsf.jar). Again, using Xalan 2 is simpler and supported.
No revision
No revision
1.11.2.4 +12 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java
Index: XalanExecutor.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/XalanExecutor.java,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -r1.11.2.3 -r1.11.2.4
--- XalanExecutor.java9 Feb 2004 22:12:34 - 1.11.2.3
+++ XalanExecutor.java2 Jun 2004 12:33:21 - 1.11.2.4
@@ -27,6 +27,7 @@
import java.lang.reflect.Field;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.JavaEnvUtils;
/**
* Command class that encapsulate specific behavior for each
@@ -86,8 +87,17 @@
xalan1missing.printStackTrace(new PrintWriter(swr));
caller.task.log("Didn't find Xalan1.", Project.MSG_DEBUG);
caller.task.log(swr.toString(), Project.MSG_DEBUG);
-
cvs commit: ant CONTRIBUTORS
bodewig 2004/06/03 01:07:45 Removed: .CONTRIBUTORS Log: Removing and re-adding as binary - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant CONTRIBUTORS
bodewig 2004/06/03 01:08:11 Added: .CONTRIBUTORS Log: Removing and re-adding as binary Revision ChangesPath 1.20 +0 -0 ant/CONTRIBUTORS - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant CONTRIBUTORS
bodewig 2004/06/03 01:09:46 Removed: .Tag: ANT_16_BRANCH CONTRIBUTORS Log: Removing and re-adding as binary - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant CONTRIBUTORS
bodewig 2004/06/03 01:10:17 Added: .Tag: ANT_16_BRANCH CONTRIBUTORS Log: Removing and re-adding as binary Revision ChangesPath No revision No revision 1.1.2.13 +0 -0 ant/CONTRIBUTORS - 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]
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/xdocs external.xml
bodewig 2004/06/04 00:58:37 Modified:docs external.html xdocsexternal.xml Log: Changes by Pavel Vlasov for his projects Revision ChangesPath 1.167 +98 -101 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- external.html 25 May 2004 10:23:02 - 1.166 +++ external.html 4 Jun 2004 07:58:37 - 1.167 @@ -1410,6 +1410,56 @@ + +Hammurapi + +Java code review tool. Performs automated code +review. Contains 111 inspectors which check different aspects +of code quality including coding standards, EJB, threading, +... + + + + Compatibility: + + + Tested with Ant 1.5 and 1.5.2 + + + + + URL: + + + http://www.hammurapi.org";>http://www.hammurapi.org + + + + + Contact: + + + http://www.hammurapi.org/content/[EMAIL PROTECTED]">Project's Contact Page + + + + + License: + + + GNU General Public License (GPL) + + + + IDLDepend @@ -2359,54 +2409,6 @@ - -Jegustator - -Jegustator is an Ant task which preforms source code and -bytecode reviews and also documents source and bytecode. - - - - Compatibility: - - - Tested with Ant 1.5.2 - - - - - URL: - - - http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED]">http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED] - - - - - Contact: - - - http://www.pavelvlasov.com/pv/content/contact.html";>Pavel Vlasov - - - - - License: - - - GNU General Public License (GPL) - - - - JFlex @@ -3135,59 +3137,6 @@ - -Pamda - -http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED]">Pamda -is an MDA tool (UML2Code generator) implemented as Ant task. Pamda supports -Aspect-Oriented Modeling (AOM) and comes with AOM UML Profile and sample project. -The tool uses XMI as its input and Velocity as template engine. All elements in -the metamodel have navigate(XPath expression) and iterate(XPath expression) -(powered by JXPath) which make templates easy to write. -Tested with XMI produced by Enterprise Architect. - - - - Compatibility: - - - Ant 1.5.2 - - - - - URL: - - - http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED]">http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED] - - - - - Contact: - - - http://www.pavelvlasov.com/pv/content/contact.html";>Pavel Vlasov - - - - - License: - - - GPL - - - - PCT @@ -4152,6 +4101,54 @@ BSD-like license + + + +
cvs commit: ant/xdocs external.xml
bodewig 2004/06/04 00:59:15 Modified:docs Tag: ANT_16_BRANCH external.html xdocsTag: ANT_16_BRANCH external.xml Log: merge Revision ChangesPath No revision No revision 1.136.2.14 +98 -101 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.136.2.13 retrieving revision 1.136.2.14 diff -u -r1.136.2.13 -r1.136.2.14 --- external.html 25 May 2004 06:37:49 - 1.136.2.13 +++ external.html 4 Jun 2004 07:59:15 - 1.136.2.14 @@ -1356,6 +1356,56 @@ + +Hammurapi + +Java code review tool. Performs automated code +review. Contains 111 inspectors which check different aspects +of code quality including coding standards, EJB, threading, +... + + + + Compatibility: + + + Tested with Ant 1.5 and 1.5.2 + + + + + URL: + + + http://www.hammurapi.org";>http://www.hammurapi.org + + + + + Contact: + + + http://www.hammurapi.org/content/[EMAIL PROTECTED]">Project's Contact Page + + + + + License: + + + GNU General Public License (GPL) + + + + IDLDepend @@ -2305,54 +2355,6 @@ - -Jegustator - -Jegustator is an Ant task which preforms source code and -bytecode reviews and also documents source and bytecode. - - - - Compatibility: - - - Tested with Ant 1.5.2 - - - - - URL: - - - http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED]">http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED] - - - - - Contact: - - - http://www.pavelvlasov.com/pv/content/contact.html";>Pavel Vlasov - - - - - License: - - - GNU General Public License (GPL) - - - - JFlex @@ -3081,59 +3083,6 @@ - -Pamda - -http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED]">Pamda -is an MDA tool (UML2Code generator) implemented as Ant task. Pamda supports -Aspect-Oriented Modeling (AOM) and comes with AOM UML Profile and sample project. -The tool uses XMI as its input and Velocity as template engine. All elements in -the metamodel have navigate(XPath expression) and iterate(XPath expression) -(powered by JXPath) which make templates easy to write. -Tested with XMI produced by Enterprise Architect. - - - - Compatibility: - - - Ant 1.5.2 - - - - - URL: - - - http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED]">http://www.pavelvlasov.com/pv/content/[EMAIL PROTECTED] - - - - - Contact: - - - http://www.pavelvlasov.com/pv/content/contact.html";>Pavel Vlasov - - - - - License: - - - GPL - - - - PCT @@ -4047,6 +3996,54 @
cvs commit: ant TODO
bodewig 2004/06/04 01:16:26 Added: .Tag: ANT_16_BRANCH TODO Log: Ant 1.6.2 TODO list Revision ChangesPath No revision No revision 1.3.2.1 +34 -13ant/Attic/TODO - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant TODO
bodewig 2004/06/04 05:00:45 Modified:.Tag: ANT_16_BRANCH TODO Log: pass 1 through bugzilla Revision ChangesPath No revision No revision 1.3.2.2 +5 -0 ant/Attic/TODO Index: TODO === RCS file: /home/cvs/ant/Attic/TODO,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -r1.3.2.1 -r1.3.2.2 --- TODO 4 Jun 2004 08:16:26 - 1.3.2.1 +++ TODO 4 Jun 2004 12:00:45 - 1.3.2.2 @@ -36,3 +36,8 @@ * and JDK 1.5 [Stefan hopes that Stephane solves it for him, otherwise he'll do it himself] +* symlink creates cyclic links. [Stefan] + +* telnet doesn't disconnect properly (PR 25935) [Stefan unless Peter + is faster]. + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant TODO
bodewig 2004/06/04 06:00:17 Modified:.Tag: ANT_16_BRANCH TODO Log: one more reproducable and simple bug Revision ChangesPath No revision No revision 1.3.2.3 +2 -0 ant/Attic/TODO Index: TODO === RCS file: /home/cvs/ant/Attic/TODO,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -r1.3.2.2 -r1.3.2.3 --- TODO 4 Jun 2004 12:00:45 - 1.3.2.2 +++ TODO 4 Jun 2004 13:00:17 - 1.3.2.3 @@ -41,3 +41,5 @@ * telnet doesn't disconnect properly (PR 25935) [Stefan unless Peter is faster]. +* creates empty + archive. [Stefan] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
