DO NOT REPLY [Bug 25938] - [PATCH] xdocs/external.xml update
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25938. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25938 [PATCH] xdocs/external.xml update --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 01:00 --- Created an attachment (id=9836) Suggested patch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25939] New: - [PATCH] Javadoc correction for Java.setJvm
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25939. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25939 [PATCH] Javadoc correction for Java.setJvm Summary: [PATCH] Javadoc correction for Java.setJvm Product: Ant Version: 1.7Alpha (nightly) Platform: All OS/Version: All Status: NEW Severity: Minor Priority: Other Component: Core tasks AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Should be self-explanatory. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25939] - [PATCH] Javadoc correction for Java.setJvm
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25939. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25939 [PATCH] Javadoc correction for Java.setJvm --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 01:02 --- Created an attachment (id=9837) Suggested patch - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25944] New: - Using filter in copy task reports Inifinite loop in tokens.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25944.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25944
Using filter in copy task reports Inifinite loop in tokens.
Summary: Using filter in copy task reports Inifinite loop in
tokens.
Product: Ant
Version: 1.6.0
Platform: PC
OS/Version: Windows NT/2K
Status: NEW
Severity: Normal
Priority: Other
Component: Core tasks
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
From tokens (tokens to be replaced):
PRODUCT_VERSION=6.2.1.4
PRODUCT_BUILD=6.5 (BLD_65036)
Replacement commands:
copy todir=sometodir overwrite=true
fileset dir=somefromdir
include name=**/*.* /
/fileset
filterset begintoken=6 endtoken=4
filter token=.2.1. value=${product.dottedbuildnum} /
/filterset
filterset begintoken=6 endtoken=)
filter token=.5 (BLD_65036
value=${product.majorrev}.${product.minorrev} (${build.number}) /
/filterset
/copy
Leads to incorrect resultant string - resultant string should be same format,
but different numbers - the actual string I get is the original strings with
the first and last tokens cut off. Ant 1.5.4 has no problem.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb JbossDeploymentTool.java
bodewig 2004/01/06 23:26:48 Modified:docs/manual/CoreTasks checksum.html docs/manual/OptionalTasks ejb.html src/main/org/apache/tools/ant IntrospectionHelper.java src/main/org/apache/tools/ant/taskdefs/optional/ejb JbossDeploymentTool.java Log: Happy New Year Revision ChangesPath 1.10 +1 -1 ant/docs/manual/CoreTasks/checksum.html Index: checksum.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/checksum.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- checksum.html 5 Jan 2004 10:52:06 - 1.9 +++ checksum.html 7 Jan 2004 07:26:48 - 1.10 @@ -178,7 +178,7 @@ the result will be true only if the checksums matched correctly for all files being considered. -hrp align=centerCopyright copy; 2001-2003 Apache Software Foundation. All rights +hrp align=centerCopyright copy; 2001-2004 Apache Software Foundation. All rights Reserved./p /body 1.38 +2 -2 ant/docs/manual/OptionalTasks/ejb.html Index: ejb.html === RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ejb.html,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- ejb.html 5 Jan 2004 11:45:07 - 1.37 +++ ejb.html 7 Jan 2004 07:26:48 - 1.38 @@ -1742,7 +1742,7 @@ /pre hr -p align=centerCopyright copy; 2000-2003 Apache Software Foundation. All rights +p align=centerCopyright copy; 2000-2004 Apache Software Foundation. All rights Reserved./p 1.73 +1 -1 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.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- IntrospectionHelper.java 6 Jan 2004 17:13:06 - 1.72 +++ IntrospectionHelper.java 7 Jan 2004 07:26:48 - 1.73 @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2003 The Apache Software Foundation. All rights + * Copyright (c) 2000-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without 1.18 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java Index: JbossDeploymentTool.java === RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- JbossDeploymentTool.java 5 Jan 2004 11:45:07 - 1.17 +++ JbossDeploymentTool.java 7 Jan 2004 07:26:48 - 1.18 @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights + * Copyright (c) 2001-2004 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/xdocs/stylesheets templates.vm
bodewig 2004/01/06 23:28:00 Modified:docs antnews.html bindownload.html bylaws.html contributors.html cvs.html external.html faq.html index.html legal.html license.html mail.html mission.html problems.html projects.html resources.html srcdownload.html docs/projects index.html docs/projects/antidote design.html index.html module.html news.html xdocs/stylesheets templates.vm Log: Update site Revision ChangesPath 1.86 +1 -1 ant/docs/antnews.html Index: antnews.html === RCS file: /home/cvs/ant/docs/antnews.html,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- antnews.html 18 Dec 2003 21:47:06 - 1.85 +++ antnews.html 7 Jan 2004 07:27:59 - 1.86 @@ -372,7 +372,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.44 +1 -1 ant/docs/bindownload.html Index: bindownload.html === RCS file: /home/cvs/ant/docs/bindownload.html,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- bindownload.html 18 Dec 2003 21:04:16 - 1.43 +++ bindownload.html 7 Jan 2004 07:27:59 - 1.44 @@ -291,7 +291,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.8 +1 -1 ant/docs/bylaws.html Index: bylaws.html === RCS file: /home/cvs/ant/docs/bylaws.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bylaws.html 2 Dec 2003 11:51:11 - 1.7 +++ bylaws.html 7 Jan 2004 07:27:59 - 1.8 @@ -772,7 +772,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.37 +1 -1 ant/docs/contributors.html Index: contributors.html === RCS file: /home/cvs/ant/docs/contributors.html,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- contributors.html 5 Dec 2003 00:16:06 - 1.36 +++ contributors.html 7 Jan 2004 07:27:59 - 1.37 @@ -458,7 +458,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.25 +1 -1 ant/docs/cvs.html Index: cvs.html === RCS file: /home/cvs/ant/docs/cvs.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- cvs.html 2 Dec 2003 11:51:11 - 1.24 +++ cvs.html 7 Jan 2004 07:27:59 - 1.25 @@ -199,7 +199,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.150 +1 -1 ant/docs/external.html Index: external.html === RCS file: /home/cvs/ant/docs/external.html,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- external.html 17 Dec 2003
cvs commit: ant/xdocs/stylesheets templates.vm
bodewig 2004/01/06 23:32:09 Modified:docs Tag: ANT_16_BRANCH antnews.html bindownload.html bylaws.html contributors.html cvs.html external.html faq.html index.html legal.html license.html mail.html mission.html problems.html projects.html resources.html srcdownload.html docs/manual/CoreTasks Tag: ANT_16_BRANCH checksum.html docs/manual/OptionalTasks Tag: ANT_16_BRANCH ejb.html docs/projects Tag: ANT_16_BRANCH index.html docs/projects/antidote Tag: ANT_16_BRANCH design.html index.html module.html src/main/org/apache/tools/ant Tag: ANT_16_BRANCH IntrospectionHelper.java src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag: ANT_16_BRANCH JbossDeploymentTool.java xdocs/stylesheets Tag: ANT_16_BRANCH templates.vm Log: Sync Revision ChangesPath No revision No revision 1.77.2.2 +1 -1 ant/docs/antnews.html Index: antnews.html === RCS file: /home/cvs/ant/docs/antnews.html,v retrieving revision 1.77.2.1 retrieving revision 1.77.2.2 diff -u -r1.77.2.1 -r1.77.2.2 --- antnews.html 5 Dec 2003 00:11:56 - 1.77.2.1 +++ antnews.html 7 Jan 2004 07:32:07 - 1.77.2.2 @@ -485,7 +485,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.36.2.1 +1 -1 ant/docs/bindownload.html Index: bindownload.html === RCS file: /home/cvs/ant/docs/bindownload.html,v retrieving revision 1.36 retrieving revision 1.36.2.1 diff -u -r1.36 -r1.36.2.1 --- bindownload.html 18 Aug 2003 09:58:27 - 1.36 +++ bindownload.html 7 Jan 2004 07:32:07 - 1.36.2.1 @@ -288,7 +288,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.3.4.1 +1 -1 ant/docs/bylaws.html Index: bylaws.html === RCS file: /home/cvs/ant/docs/bylaws.html,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -u -r1.3 -r1.3.4.1 --- bylaws.html 3 Jul 2003 08:37:17 - 1.3 +++ bylaws.html 7 Jan 2004 07:32:07 - 1.3.4.1 @@ -769,7 +769,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.29.2.2 +1 -1 ant/docs/contributors.html Index: contributors.html === RCS file: /home/cvs/ant/docs/contributors.html,v retrieving revision 1.29.2.1 retrieving revision 1.29.2.2 diff -u -r1.29.2.1 -r1.29.2.2 --- contributors.html 4 Dec 2003 22:36:37 - 1.29.2.1 +++ contributors.html 7 Jan 2004 07:32:07 - 1.29.2.2 @@ -447,7 +447,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All rights reserved. +Copyright copy; 2000-2004nbsp;The Apache Software Foundation. All rights reserved. script type=text/javascript language=JavaScript!-- document.write( - +Last Published: + document.lastModified); // -- 1.20.2.1 +1 -1 ant/docs/cvs.html Index: cvs.html === RCS file: /home/cvs/ant/docs/cvs.html,v retrieving revision 1.20 retrieving revision 1.20.2.1 diff -u -r1.20 -r1.20.2.1 --- cvs.html 3 Jul 2003 08:37:17 - 1.20 +++ cvs.html 7 Jan 2004 07:32:07 - 1.20.2.1 @@ -196,7 +196,7 @@ /div p class=copyright -Copyright copy; 2000-2003nbsp;The Apache Software Foundation. All
Re: Memory utilization on ANT 1.6.0
On Tue, 23 Dec 2003, Antoine Lévy-Lambert [EMAIL PROTECTED] wrote: Because of these type of issues, a number of tasks which in the execute method are changing instance variables are resetting these instance variables at the end of the execute method. Historically the tasks are doing so for a different reason. In Ant 1.6 task instances could get reused. Say you have target A depending on B and somebody runs ant A B, then B will get executed twice and reuse the instances created in the first execution on the second run. AFAIU task instances are no longer supposed to get reused that way in 1.6 and thus the guarding code should be obsolute now. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: XML Namespace avoids collision between xml vocabularies was RE: a comment about xml namespace
On Tue, 30 Dec 2003, Steve Loughran [EMAIL PROTECTED] wrote: msbuild: declare everything (I think) Not quite. You can leave it to the tasks as well, but the MSBuild team currently thinks that declare everything was superior. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Selecting XML Parsers
On Tue, 30 Dec 2003, Jose Alberto Fernandez [EMAIL PROTECTED] wrote: That does not seem to work in 1.6.0 since style/ only uses the classpath to find the the Liason but the TRAX liason does not uses it to find the factories. I don't think this has changed in 1.6 at all. The main issue here seem to be that non of our tasks set the ContextClassLoader before calling the methods on the xml-apis. I agree that they should set the context classloader. Am I doing something wrong? I think we have a backward compatibility issue here. Only if it actually worked in 1.5.x 8-) And I'd like to understand why it works for you there before changing 1.6. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25944] - Using filter in copy task reports Inifinite loop in tokens.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25944. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25944 Using filter in copy task reports Inifinite loop in tokens. [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 09:38 --- *** This bug has been marked as a duplicate of 23154 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 23154] - Filterset goes invalid after first copy operation in copy task
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23154. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23154 Filterset goes invalid after first copy operation in copy task [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 09:38 --- *** Bug 25944 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: a comment about xml namespace
On Fri, 02 Jan 2004, Gus Heck [EMAIL PROTECTED] wrote: 1. There should be a name space URI that ant uses to identify it's internal core components... antlib:org.apache.tools.ant 2. The name space URI that a given antlib declares to identify it's components and is associated with user specified prefix.We probably should require these URI's to use the antlib:// scheme so that they are easily identified as xml elements that we do need to pay attention to. Nit picking, our URI is opaque not hierarchical so there is no // after the colon 8-) I disagree that we should force any rules on the URI. The antlib URI space is used to auto-locate descriptors only. If the only goal is that we can have XML content that doesn't get parsed by Ant, we should rather ignore namespaces that are not typedefed. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: ant 1.6.1 [was: Pb with namespaces in Ant 1.6 official]
On Tue, 06 Jan 2004, Antoine Lévy-Lambert [EMAIL PROTECTED] wrote: Dominique Devienne wrote: Does this warrant a 1.6.1? I'm actually quite stuck because of this bug This bug is impacting the most salient feature of ant 1.6.0, in the core of ant, so it is important. +1 Do we want to fix other bugs in 1.6.1 ? So far every commit to HEAD has been merged to the branch AFAICT. Has anything major come up so far? Sorry, I haven't had time to browse bugzilla so far. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: build.xml and DTD
http://ant.apache.org/faq.html#dtd - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Default setting of the javac includeAntRuntime attribute?
On Mon, 5 Jan 2004, Kenneth Olving [EMAIL PROTECTED] wrote: But, I expect this simply has to do with backwards compatibility. You are correct (that's been my motivation back then). Is this correct, and there is just no way this will change? Ant 1.6.0 and presetdef is your friend. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs copy.xml
peterreilly2004/01/07 02:11:38
Modified:src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
FilterSet.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH CopyTest.java
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH copy.xml
Log:
Sync with head
Revision ChangesPath
No revision
No revision
1.23.2.1 +5 -3 ant/src/main/org/apache/tools/ant/types/FilterSet.java
Index: FilterSet.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/FilterSet.java,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- FilterSet.java13 Aug 2003 15:14:31 - 1.23
+++ FilterSet.java7 Jan 2004 10:11:38 - 1.23.2.1
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -357,6 +357,8 @@
* @return The string with the tokens replaced.
*/
public String replaceTokens(String line) {
+passedTokens = null; // reset for new line
+
String beginToken = getBeginToken();
String endToken = getEndToken();
int index = line.indexOf(beginToken);
@@ -415,7 +417,7 @@
* This parses tokens which point to tokens.
* It also maintains a list of currently used tokens, so we cannot
* get into an infinite loop
- * @param value the value / token to parse
+ * @param line the value / token to parse
* @param parent the parant token (= the token it was parsed from)
*/
private String replaceTokens(String line, String parent)
@@ -426,7 +428,7 @@
if (passedTokens.contains(parent) !duplicateToken) {
duplicateToken = true;
StringBuffer sb = new StringBuffer();
-sb.append(Inifinite loop in tokens. Currently known tokens : );
+sb.append(Infinite loop in tokens. Currently known tokens : );
sb.append(passedTokens);
sb.append(\nProblem token : + getBeginToken() + parent
+ getEndToken());
No revision
No revision
1.12.2.1 +6 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
Index: CopyTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- CopyTest.java 28 Mar 2003 07:33:05 - 1.12
+++ CopyTest.java 7 Jan 2004 10:11:38 - 1.12.2.1
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -126,6 +126,11 @@
}
+public void testFilterTest() {
+executeTarget(filtertest);
+assertTrue(getOutput().indexOf(loop in tokens) == -1);
+}
+
public void testFilterSet() throws IOException {
executeTarget(testFilterSet);
FileUtils fileUtils = FileUtils.newFileUtils();
No revision
No revision
1.11.2.1 +22 -0 ant/src/etc/testcases/taskdefs/copy.xml
Index: copy.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/copy.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- copy.xml 28 Mar 2003 07:35:31 - 1.11
+++ copy.xml 7 Jan 2004 10:11:38 - 1.11.2.1
@@ -10,6 +10,24 @@
copy file=copy.xml todir=copytest1dir overwrite=true/
/target
+ target name=filtertest
+!-- check fix for bugzilla 23154 --
+delete quiet=yes file=copy.filter.out/
+delete quiet=yes file=copy.filter.inp/
+concat destfile=copy.filter.inp
+PRODUCT_VERSION=6.2.1.4
+PRODUCT_BUILD=6.5 (BLD_65036)
+PRODUCT_VERSION=6.2.1.4
+PRODUCT_BUILD=6.5 (BLD_65036)
+/concat
+copy file=copy.filter.inp tofile=copy.filter.out
+ filterset begintoken=6 endtoken=4
+filter token=.2.1. value=2.6.4 /
+ /filterset
+/copy
+concatpath path=copy.filter.out//concat
+ /target
+
target name=test3
!-- create an empty file --
touch file=copytest3.tmp/
@@ -89,6
DO NOT REPLY [Bug 23154] - Filterset goes invalid after first copy operation in copy task
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23154. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23154 Filterset goes invalid after first copy operation in copy task [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 10:12 --- Found (I think) the problem, a fix is in cvs and should be ready for ant 1.6.1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/etc/testcases/taskdefs copy.xml
peterreilly2004/01/07 02:25:54
Modified:src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
FilterSet.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH CopyTest.java
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH copy.xml
Log:
Sync with head
Revision ChangesPath
No revision
No revision
1.23.2.2 +17 -3 ant/src/main/org/apache/tools/ant/types/FilterSet.java
Index: FilterSet.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/FilterSet.java,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- FilterSet.java7 Jan 2004 10:11:38 - 1.23.2.1
+++ FilterSet.java7 Jan 2004 10:25:53 - 1.23.2.2
@@ -351,14 +351,28 @@
/**
* Does replacement on the given string with token matching.
- * This uses the defined begintoken and endtoken values which default to
@ for both.
+ * This uses the defined begintoken and endtoken values which default
+ * to @ for both.
+ * This resets the passedTokens and calls iReplaceTokens to
+ * do the actual replacements.
*
* @param line The line to process the tokens in.
* @return The string with the tokens replaced.
*/
public String replaceTokens(String line) {
passedTokens = null; // reset for new line
-
+return iReplaceTokens(line);
+}
+
+/**
+ * Does replacement on the given string with token matching.
+ * This uses the defined begintoken and endtoken values which default
+ * to @ for both.
+ *
+ * @param line The line to process the tokens in.
+ * @return The string with the tokens replaced.
+ */
+private String iReplaceTokens(String line) {
String beginToken = getBeginToken();
String endToken = getEndToken();
int index = line.indexOf(beginToken);
@@ -439,7 +453,7 @@
return parent;
}
passedTokens.addElement(parent);
-String value = this.replaceTokens(line);
+String value = iReplaceTokens(line);
if (value.indexOf(getBeginToken()) == -1 !duplicateToken) {
duplicateToken = false;
passedTokens = null;
No revision
No revision
1.12.2.2 +5 -0
ant/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
Index: CopyTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- CopyTest.java 7 Jan 2004 10:11:38 - 1.12.2.1
+++ CopyTest.java 7 Jan 2004 10:25:53 - 1.12.2.2
@@ -130,6 +130,11 @@
executeTarget(filtertest);
assertTrue(getOutput().indexOf(loop in tokens) == -1);
}
+
+public void testInfiniteFilter() {
+executeTarget(infinitetest);
+assertTrue(getOutput().indexOf(loop in tokens) != -1);
+}
public void testFilterSet() throws IOException {
executeTarget(testFilterSet);
No revision
No revision
1.11.2.2 +14 -0 ant/src/etc/testcases/taskdefs/copy.xml
Index: copy.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/copy.xml,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- copy.xml 7 Jan 2004 10:11:38 - 1.11.2.1
+++ copy.xml 7 Jan 2004 10:25:54 - 1.11.2.2
@@ -28,6 +28,20 @@
concatpath path=copy.filter.out//concat
/target
+ target name=infinitetest
+delete quiet=yes file=copy.filter.out/
+delete quiet=yes file=copy.filter.inp/
+concat destfile=copy.filter.inp
+a=b=
+/concat
+copy file=copy.filter.inp tofile=copy.filter.out
+ filterset begintoken== endtoken==
+filter token=b value==b=/
+ /filterset
+/copy
+concatpath path=copy.filter.out//concat
+ /target
+
target name=test3
!-- create an empty file --
touch file=copytest3.tmp/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25944] - Using filter in copy task reports Inifinite loop in tokens.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25944. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25944 Using filter in copy task reports Inifinite loop in tokens. --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 10:31 --- Thanks for the report. This should be fixed in ant 1.6.1 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Did 1.6 break old filter behaviour?
I have found the cause of the error.
This will be fixed in ant 1.6.1.
Peter
Colin Sampaleanu wrote:
That solution doesn't work too well, since I was relying on global
filters for copying in several places, and don't want to redefine them
each time. However, I was also already using
filterchain
expandproperties/
/filterchain
in the copy tasks, so until this is fixed I am doing something like
this to define the filter/prop to replace:
!-- broken, use property instead --
!--filter token=EMAIL_FROM value=${email.from} /--
property name=EMAIL_FROM value=${email.from} /
and in my source file I have replaced all @EMAIL_FROM@ occurences to
${EMAIL_FROM}
Regards,
Colin
Peter Reilly wrote:
Until it gets fixed, you could use a filterchain with replacestring
instead:
target name=chain
delete quiet=yes file=filter.out/
copy file=filter.inp tofile=filter.out
filterchain
replacestring from=@EMAIL_FROM@ to=[EMAIL PROTECTED]/
/filterchain
/copy
/target
Peter
Colin Sampaleanu wrote:
Bummer, this is pretty nasty...
Peter Reilly wrote:
This looks like the same problem as
http://issues.apache.org/bugzilla/show_bug.cgi?id=23154
which we have not been able to reproduce.
With an input file: filter.inp
@EMAIL_FROM@ token
@EMAIL_FROM@ token
and a build file:
project
property name=email.from value=[EMAIL PROTECTED]/
filter token=EMAIL_FROM value=${email.from} /
delete quiet=yes file=filter.out/
copy file=filter.inp tofile=filter.out filtering=yes/
/project
the problem can be reproduced.
Peter
Colin Sampaleanu wrote:
I have a filter set as follows:
property name=email.from value=[EMAIL PROTECTED]/
...
filter token=EMAIL_FROM value=${email.from} /
this worked fine in ant 1.5, for replacing this filter value in a
file with multiple @EMAIL_FROM@ tokens in it, via a copy task with
filter=on
With ant 1.6, I now get this behaviour:
[copy] Copying 1 file to
D:\src\something\cvs\core\core-services\target\classes
[copy] Replacing: @EMAIL_FROM@ - [EMAIL PROTECTED]
[copy] Inifinite loop in tokens. Currently known tokens :
[EMAIL_FROM]
[copy] Problem token : @EMAIL_FROM@ called from @EMAIL_FROM@
[copy] Replacing: @EMAIL_FROM@ - EMAIL_FROM
[copy] Replacing: @EMAIL_FROM@ - EMAIL_FROM
[copy] Replacing: @EMAIL_FROM@ - EMAIL_FROM
[copy] Replacing: @EMAIL_FROM@ - EMAIL_FROM
[copy] Replacing: @EMAIL_FROM@ - EMAIL_FROM
[copy] Replacing: @EMAIL_FROM@ - EMAIL_FROM
... and so on
Now obviously the @ sign in the email address is confusing the
token processor, and it works fine if I replace it with another
value, but this worked fine in ant 1.5!
Can anybody confirm if this is a bug?
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant WHATSNEW
peterreilly2004/01/07 02:36:37 Modified:.WHATSNEW Log: Update with the fixs for filters, namespace and ejb task Revision ChangesPath 1.515 +4 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.514 retrieving revision 1.515 diff -u -r1.514 -r1.515 --- WHATSNEW 18 Dec 2003 08:39:06 - 1.514 +++ WHATSNEW 7 Jan 2004 10:36:37 - 1.515 @@ -8,6 +8,10 @@ --- * Translate task does not remove tokens when a key is not found. It logs a verbose message. Bugzilla Report 13936. +* Fix spurious infinite loop detection for filters (introduced in ant 1.6.0). + Bugzilla Report 23154. +* Fix handling of default ant namespace for nested elements. +* Fix jboss element of ejb task (introduced in ant 1.6.0). Other changes: -- - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand properties in attributes to project/target tags
people would expect xyzzy to get executed (it won't with your patch,
Ant will fail because no target ${baz} exists instead). This would
break the static target dependency analysis for Ant.
Ah. Ok, got it. Theoretically, the patch could be applied to the project tag
only then - but considering the other arguments it probably just muddies the
waters, so better leave them both alone, especially since it isn't that hard to
achieve the effect I was after in another manner.
Thank you all,
ken1
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: ant 1.6.1 [was: Pb with namespaces in Ant 1.6 official]
Stefan Bodewig wrote: On Tue, 06 Jan 2004, Antoine Lévy-Lambert [EMAIL PROTECTED] wrote: Dominique Devienne wrote: Does this warrant a 1.6.1? I'm actually quite stuck because of this bug This bug is impacting the most salient feature of ant 1.6.0, in the core of ant, so it is important. +1 Do we want to fix other bugs in 1.6.1 ? So far every commit to HEAD has been merged to the branch AFAICT. Has anything major come up so far? Sorry, I haven't had time to browse bugzilla so far. The two that are fairly serious is the filter fix (just now) and the jboss element for the ejb task (not in bugzilla). Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 10413] - enhancement: JUnit task only creates one forked VM per batch
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10413. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=10413 enhancement: JUnit task only creates one forked VM per batch --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 10:50 --- Cleaning up is what teardown() methods are meant to be for, and like DD says, this is optional. Also I've found java to be less contaminated by bad test than say, Cpp unit, where a pointer defect or failure to release a reference in one test case destroys all that follow it. Therefore I think a single VM for all forked tests could be a good addition -those projects with many tests will appreciate it; we just need to do it in a way that integrates with everything. DD: try applying these patches and tell me what you think? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs JarTest.java
bodewig 2004/01/07 04:55:15
Modified:src/testcases/org/apache/tools/ant
IntrospectionHelperTest.java
src/testcases/org/apache/tools/ant/taskdefs JarTest.java
Log:
some more variables named enum
Revision ChangesPath
1.17 +7 -7
ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
Index: IntrospectionHelperTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- IntrospectionHelperTest.java 26 Aug 2003 08:21:02 - 1.16
+++ IntrospectionHelperTest.java 7 Jan 2004 12:55:15 - 1.17
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001,2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001,2003-2004 The Apache Software Foundation. All
rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -195,9 +195,9 @@
h.put(fourteen, java.lang.StringBuffer.class);
h.put(fifteen, java.lang.StringBuffer.class);
IntrospectionHelper ih = IntrospectionHelper.getHelper(getClass());
-Enumeration enum = ih.getNestedElements();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+Enumeration e = ih.getNestedElements();
+while (e.hasMoreElements()) {
+String name = (String) e.nextElement();
Class expect = (Class) h.get(name);
assertNotNull(Support for +name+ in IntrospectioNHelperTest?,
expect);
@@ -408,9 +408,9 @@
h.put(name, java.lang.String.class);
IntrospectionHelper ih = IntrospectionHelper.getHelper(getClass());
-Enumeration enum = ih.getAttributes();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+Enumeration e = ih.getAttributes();
+while (e.hasMoreElements()) {
+String name = (String) e.nextElement();
Class expect = (Class) h.get(name);
assertNotNull(Support for +name+ in IntrospectionHelperTest?,
expect);
1.24 +4 -4
ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Index: JarTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JarTest.java 3 Dec 2003 21:58:07 - 1.23
+++ JarTest.java 7 Jan 2004 12:55:15 - 1.24
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -244,10 +244,10 @@
try {
executeTarget(testIndexTests);
archive = new ZipFile(getProject().resolveFile(tempJar));
-Enumeration enum = archive.entries();
+Enumeration e = archive.entries();
int numberOfIndexLists = 0;
-while (enum.hasMoreElements()) {
-ZipEntry ze = (ZipEntry) enum.nextElement();
+while (e.hasMoreElements()) {
+ZipEntry ze = (ZipEntry) e.nextElement();
if (ze.getName().equals(META-INF/INDEX.LIST)) {
numberOfIndexLists++;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs JarTest.java
bodewig 2004/01/07 04:55:52
Modified:src/testcases/org/apache/tools/ant Tag: ANT_16_BRANCH
IntrospectionHelperTest.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH JarTest.java
Log:
Sync with HEAD
Revision ChangesPath
No revision
No revision
1.16.2.1 +7 -7
ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java
Index: IntrospectionHelperTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/IntrospectionHelperTest.java,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -r1.16 -r1.16.2.1
--- IntrospectionHelperTest.java 26 Aug 2003 08:21:02 - 1.16
+++ IntrospectionHelperTest.java 7 Jan 2004 12:55:52 - 1.16.2.1
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2001,2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001,2003-2004 The Apache Software Foundation. All
rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -195,9 +195,9 @@
h.put(fourteen, java.lang.StringBuffer.class);
h.put(fifteen, java.lang.StringBuffer.class);
IntrospectionHelper ih = IntrospectionHelper.getHelper(getClass());
-Enumeration enum = ih.getNestedElements();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+Enumeration e = ih.getNestedElements();
+while (e.hasMoreElements()) {
+String name = (String) e.nextElement();
Class expect = (Class) h.get(name);
assertNotNull(Support for +name+ in IntrospectioNHelperTest?,
expect);
@@ -408,9 +408,9 @@
h.put(name, java.lang.String.class);
IntrospectionHelper ih = IntrospectionHelper.getHelper(getClass());
-Enumeration enum = ih.getAttributes();
-while (enum.hasMoreElements()) {
-String name = (String) enum.nextElement();
+Enumeration e = ih.getAttributes();
+while (e.hasMoreElements()) {
+String name = (String) e.nextElement();
Class expect = (Class) h.get(name);
assertNotNull(Support for +name+ in IntrospectionHelperTest?,
expect);
No revision
No revision
1.22.2.2 +4 -4
ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Index: JarTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- JarTest.java 3 Dec 2003 22:06:41 - 1.22.2.1
+++ JarTest.java 7 Jan 2004 12:55:52 - 1.22.2.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -244,10 +244,10 @@
try {
executeTarget(testIndexTests);
archive = new ZipFile(getProject().resolveFile(tempJar));
-Enumeration enum = archive.entries();
+Enumeration e = archive.entries();
int numberOfIndexLists = 0;
-while (enum.hasMoreElements()) {
-ZipEntry ze = (ZipEntry) enum.nextElement();
+while (e.hasMoreElements()) {
+ZipEntry ze = (ZipEntry) e.nextElement();
if (ze.getName().equals(META-INF/INDEX.LIST)) {
numberOfIndexLists++;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: Memory utilization on ANT 1.6.0
From: Stefan Bodewig [mailto:[EMAIL PROTECTED] Historically the tasks are doing so for a different reason. In Ant 1.6 task instances could get reused. Say you have target A depending on B and somebody runs ant A B, then B will get executed twice and reuse the instances created in the first execution on the second run. AFAIU task instances are no longer supposed to get reused that way in 1.6 and thus the guarding code should be obsolute now. How does it work in 1.6? Does ant A B will still execute target B twice? I think we really need to define a clean-up hook-up for the tasks that by default just removes the task from the RuntimeConfigurable or UnknownElement holder instance. Do not know all the consequences, but it seem like the right kind of thing to do. Jose Alberto - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Memory utilization on ANT 1.6.0
On Wed, 7 Jan 2004, Jose Alberto Fernandez [EMAIL PROTECTED] wrote: How does it work in 1.6? Does ant A B will still execute target B twice? I hope so. But I'm not sure whether it still reuses the same task instances. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: ant 1.6.1 [was: Pb with namespaces in Ant 1.6 official]
From: Antoine Lévy-Lambert [mailto:[EMAIL PROTECTED] Dominique : can you use a patched version of ant 1.6.0 until we provide an official new release ? Actually, thanks to Peter's answer I'm not stuck any more. At first I thought I couldn't use namespaces at all to turn around the bug, which would have stuck me, but in fact I still can use namespaces, just not assign a default namespace on the root element, thus leaving NCNames in NO namespace instead of the (default) Ant namespace. So in short I can do: project xmlns:ac=antlib:net.sf.antcontrib xmlns:bm=antlib:com.lgc.buildmagic ... / instead of project xmlns=antlib:org.apache.tools.ant xmlns:ac=antlib:net.sf.antcontrib xmlns:bm=antlib:com.lgc.buildmagic ... / which does not work with Ant 1.6. The only consequence this had for me was to change an XSL stylesheet processing the build.xml (to extract some meta-data from it) to match elements in no namespace instead of the Ant namespace (I was still using ant:core, so I had to change something anyhow.) That said, I'd welcome a 1.6.1 release, but I think it's not as much a priority for me now that I have a turn around. --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
From: Stefan Bodewig [mailto:[EMAIL PROTECTED]
people would expect xyzzy to get executed (it won't with your patch,
Ant will fail because no target ${baz} exists instead). This would
break the static target dependency analysis for Ant.
Did you see the patch to allow regexp in the depends attribute Stefan.
This one on the other hand doesn't break the static dependency checking,
and I think it would be useful. What do you think? --DD
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Code Copyright
Hi Stefan, I'm looking at your Happy New Year commit, and wonder about the rational behind not listing years the source was not changed; - * Copyright (c) 2000-2001,2003 The Apache Software Foundation. All rights + * Copyright (c) 2000-2001,2003-2004 The Apache Software Foundation. All rights Even though there was no modification of a particular file, that doesn't mean the file is not copyrighted. And Such a scheme will eventually grow to yield valid long and ugly looking lines for the copyright years. Why not simply use (inception year)-(last modification year), 2000-2004 in this particular case? Happy New Year to you too ;-) --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
On Wed, 7 Jan 2004, Dominique Devienne [EMAIL PROTECTED] wrote: Did you see the patch to allow regexp in the depends attribute Stefan. Yes. This one on the other hand doesn't break the static dependency checking, True. and I think it would be useful. This I'm not sure of. I wouldn't oppose the patch, but am not convinced that it is really needed. Do you have an example that will let me throw my hands up shouting of course, we need this!? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Code Copyright
On Wed, 7 Jan 2004, Dominique Devienne [EMAIL PROTECTED] wrote: I'm looking at your Happy New Year commit, and wonder about the rational behind not listing years the source was not changed; I don't understand American Copyright law even remotely well enough to actually tell you 8-) I've been taught (by Australians, mind you), to write the Copyright lines exactly that way. Include the years it has changed and don't list the years that didn't see any changes. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
Then that gets into the question of what goes into 1.6.1, bug fixes only or enhancements? -Matt --- Stefan Bodewig [EMAIL PROTECTED] wrote: On Wed, 7 Jan 2004, Dominique Devienne [EMAIL PROTECTED] wrote: Did you see the patch to allow regexp in the depends attribute Stefan. Yes. This one on the other hand doesn't break the static dependency checking, True. and I think it would be useful. This I'm not sure of. I wouldn't oppose the patch, but am not convinced that it is really needed. Do you have an example that will let me throw my hands up shouting of course, we need this!? Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 23526] - PATCH: touch should support nested filelist elements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23526. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23526 PATCH: touch should support nested filelist elements [EMAIL PROTECTED] changed: What|Removed |Added Summary|touch should support |PATCH: touch should |nested filelist elements |support nested filelist ||elements --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 15:44 --- Modifying the summary to obviously specify that a patch is attached to this bug in the hopes of generating interest with any committer who cares about the touch task... ;) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
From: Stefan Bodewig [mailto:[EMAIL PROTECTED] and I think it would be useful. This I'm not sure of. I wouldn't oppose the patch, but am not convinced that it is really needed. Do you have an example that will let me throw my hands up shouting of course, we need this!? OK, I can't easily ;-) The one use case I would have would also require to be able to control the ordering of the targets, and even that's a stretch. For maybe a little use case, we have different types of tests, UNIT tests, GUI tests, DB tests, etc... each in its own target. The test target calls them all, by explicitly listing all the test types. I'd happily write depends=test-* insteall of depends=test-UNIT, test-GUI, test-DB, Anyways, maybe the patch writer would have a better use case ;-) --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
Matt Benson wrote: Then that gets into the question of what goes into 1.6.1, bug fixes only or enhancements? -Matt bug fixes, unless the enhancements are really compelling. We want to make moving from 1.6.0 to 1.6.1 easy, and like build file compatibility across major releases as much as possible (because IDEs have a fair lag in their release schedule). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
That was my point. Doesn't the RE patch fall into the second category? -Matt --- Steve Loughran [EMAIL PROTECTED] wrote: Matt Benson wrote: Then that gets into the question of what goes into 1.6.1, bug fixes only or enhancements? -Matt bug fixes, unless the enhancements are really compelling. We want to make moving from 1.6.0 to 1.6.1 easy, and like build file compatibility across major releases as much as possible (because IDEs have a fair lag in their release schedule). - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/util JavaEnvUtils.java
bodewig 2004/01/07 08:49:30
Modified:docs/manual/CoreTasks javac.html
src/main/org/apache/tools/ant/taskdefs Javac.java
src/main/org/apache/tools/ant/taskdefs/compilers
CompilerAdapterFactory.java
DefaultCompilerAdapter.java
src/main/org/apache/tools/ant/util JavaEnvUtils.java
Log:
Very initial JDK 1.5 support
Revision ChangesPath
1.43 +7 -6 ant/docs/manual/CoreTasks/javac.html
Index: javac.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/javac.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- javac.html15 Aug 2003 09:11:47 - 1.42
+++ javac.html7 Jan 2004 16:49:30 - 1.43
@@ -52,9 +52,10 @@
licodeclassic/code (the standard compiler of JDK 1.1/1.2) ndash;
codejavac1.1/code and
codejavac1.2/code can be used as aliases./li
- licodemodern/code (the standard compiler of JDK 1.3/1.4) ndash;
+ licodemodern/code (the standard compiler of JDK 1.3/1.4/1.5) ndash;
codejavac1.3/code and
- codejavac1.4/code can be used as aliases./li
+ codejavac1.4/code and
+ codejavac1.5/code can be used as aliases./li
licodejikes/code (the a
href=http://oss.software.ibm.com/developerworks/opensource/jikes/;
target=_topJikes/a
compiler)./li
@@ -235,7 +236,7 @@
td valign=topGenerate class files for specific VM version
(e.g., code1.1/code or code1.2/code). bNote that the
default value depends on the JVM that is running Ant. In
-particular, if you use JDK 1.4 the generated classes will not be
+particular, if you use JDK 1.4+ the generated classes will not be
usable for a 1.1 Java VM unless you explicitly set this attribute
to the value 1.1 (which is the default value for JDK 1.1 to
1.3)./b/td
@@ -310,12 +311,12 @@
td valign=topsource/td
td valign=topValue of the code-source/code command-line
-switch; will be ignored by all implementations except
+switch; will be ignored by all implementations prior to
codejavac1.4/code (or codemodern/code when Ant is not
running in a 1.3 VM) and codejikes/code.br If you use this
attribute together with codejikes/code, you must make sure
that your version of jikes supports the code-source/code
-switch.br Legal values are code1.3/code and code1.4/code
+switch.br Legal values are code1.3/code, code1.4/code and
code1.5/code
ndash; by default, no code-source/code argument will be used
at all./td
@@ -594,7 +595,7 @@
codelt;javacgt;/code./p
hr
-p align=centerCopyright copy; 2000-2003 Apache Software Foundation.
+p align=centerCopyright copy; 2000-2004 Apache Software Foundation.
All rights Reserved./p
/body
1.116 +8 -5 ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- Javac.java16 Sep 2003 09:08:55 - 1.115
+++ Javac.java7 Jan 2004 16:49:30 - 1.116
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -155,6 +155,8 @@
facade = new FacadeTaskHelper(javac1.3);
} else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_4)) {
facade = new FacadeTaskHelper(javac1.4);
+} else if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_5)) {
+facade = new FacadeTaskHelper(javac1.5);
} else {
facade = new FacadeTaskHelper(classic);
}
@@ -198,7 +200,7 @@
*
* If you use this attribute together with jikes, you must
* make sure that your version of jikes supports the -source switch.
- * Legal values are 1.3 and 1.4 - by default, no -source argument
+ * Legal values are 1.3, 1.4 and 1.5 - by default, no -source argument
* will be used at all.
*
* @param v Value to assign to source.
@@ -845,7 +847,7 @@
*
* @param compilerImpl the name of the compiler implementation
* @return true if compilerImpl is modern, classic, javac1.1,
- * javac1.2, javac1.3 or javac1.4.
+ * javac1.2, javac1.3, javac1.4 or javac1.5.
*/
protected boolean isJdkCompiler(String compilerImpl) {
return
Re: cvs commit: ant/src/main/org/apache/tools/ant/util JavaEnvUtils.java
On 7 Jan 2004, [EMAIL PROTECTED] wrote: Very initial JDK 1.5 support I intend to merge this into the 1.6 branch when done. done here means that I at least want to look into changes to javac and javadoc (related to generics and potentially metadata). Right now the patch assumes that javac is the same as the one for 1.4 which is certainly wrong. Stefan - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
From: Matt Benson [mailto:[EMAIL PROTECTED] That was my point. Doesn't the RE patch fall into the second category? Do you mean to say allowing regexp in target's depends attribute is a compelling-enough enhancement to warrant putting in Ant 1.6.1? Stefan probably doesn't think so, and I suspect he's probably not alone. I like the idea of this new feature but I can live without it for now. --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
No, the second category I referred to was enhancements in general, and I was alluding to the idea of his enhancement made it into 1.6.1, why not mine? and so on. Or to make a long story short, my weightless vote would be a -1. -Matt --- Dominique Devienne [EMAIL PROTECTED] wrote: From: Matt Benson [mailto:[EMAIL PROTECTED] That was my point. Doesn't the RE patch fall into the second category? Do you mean to say allowing regexp in target's depends attribute is a compelling-enough enhancement to warrant putting in Ant 1.6.1? Stefan probably doesn't think so, and I suspect he's probably not alone. I like the idea of this new feature but I can live without it for now. --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
From: Dominique Devienne [mailto:[EMAIL PROTECTED]
For maybe a little use case, we have different types of
tests, UNIT tests, GUI tests, DB tests, etc... each in its own target.
The test target calls them all, by explicitly listing all the
test types. I'd happily write depends=test-* insteall of
depends=test-UNIT, test-GUI, test-DB,
Hummm, this looks like a foreach to me. Or more exactly
using the new for/ task of antcontrib (which I think it should be
candidate to the 3rd party task of the year award).
Find all the target names into a property and then use for to execute
the antcalls:
for param=target list=${test.targets}
sequential
antcall target=@{target}/
/sequential
/for
I use a script to look at target names and get those of my interest.
In other words, it seems all you may want to do can be done with
the available tasks.
Anyways, maybe the patch writer would have a better use case ;-)
Yeap.
Jose Alberto
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
From: Jose Alberto Fernandez [mailto:[EMAIL PROTECTED]
From: Dominique Devienne [mailto:[EMAIL PROTECTED]
For maybe a little use case, we have different types of
tests, UNIT tests, GUI tests, DB tests, etc... each in its own target.
The test target calls them all, by explicitly listing all the
test types. I'd happily write depends=test-* insteall of
depends=test-UNIT, test-GUI, test-DB,
Hummm, this looks like a foreach to me. Or more exactly
using the new for/ task of antcontrib (which I think it should be
candidate to the 3rd party task of the year award).
Find all the target names into a property and then use for to execute
the antcalls:
for param=target list=${test.targets}
sequential
antcall target=@{target}/
/sequential
/for
Hmmm, you have to pay the expense of an antcall,
which is significant in speed but especially in memory,
and then you must be careful of property/reference inheritance,
and bypass the static target analysis.
I use a script to look at target names and get those of my interest.
Thus you need a scripting language and bsf and write a script to
look up target names... I'm not that fond of such a solution.
In other words, it seems all you may want to do can be done with
the available tasks.
Without going to Perl-extremes, sometimes having multiple ways to
do something is a good thing, especially when one way is in the fact
very convoluted, requires lots of external tasks/code, and the
other way is cleaner, faster, uses less memory, and is built-in
without any external dependencies.
Which is why I still favor this enhancement. --DD
Anyways, maybe the patch writer would have a better use case ;-)
Yeap.
Jose Alberto
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
Actually the new for task uses a macrodef type
approach to avoid the antcall.
-Matt
--- Dominique Devienne [EMAIL PROTECTED] wrote:
From: Jose Alberto Fernandez
[mailto:[EMAIL PROTECTED]
From: Dominique Devienne
[mailto:[EMAIL PROTECTED]
For maybe a little use case, we have different
types of
tests, UNIT tests, GUI tests, DB tests, etc...
each in its own target.
The test target calls them all, by explicitly
listing all the
test types. I'd happily write depends=test-*
insteall of
depends=test-UNIT, test-GUI, test-DB,
Hummm, this looks like a foreach to me. Or more
exactly
using the new for/ task of antcontrib (which I
think it should be
candidate to the 3rd party task of the year
award).
Find all the target names into a property and
then use for to execute
the antcalls:
for param=target list=${test.targets}
sequential
antcall target=@{target}/
/sequential
/for
Hmmm, you have to pay the expense of an antcall,
which is significant in speed but especially in
memory,
and then you must be careful of property/reference
inheritance,
and bypass the static target analysis.
I use a script to look at target names and get
those of my interest.
Thus you need a scripting language and bsf and write
a script to
look up target names... I'm not that fond of such a
solution.
In other words, it seems all you may want to do
can be done with
the available tasks.
Without going to Perl-extremes, sometimes having
multiple ways to
do something is a good thing, especially when one
way is in the fact
very convoluted, requires lots of external
tasks/code, and the
other way is cleaner, faster, uses less memory, and
is built-in
without any external dependencies.
Which is why I still favor this enhancement. --DD
Anyways, maybe the patch writer would have a
better use case ;-)
Yeap.
Jose Alberto
-
To unsubscribe, e-mail:
[EMAIL PROTECTED]
For additional commands, e-mail:
[EMAIL PROTECTED]
__
Do you Yahoo!?
Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes
http://hotjobs.sweepstakes.yahoo.com/signingbonus
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
typo
I think it's typo. Index: import.html === RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/import.html,v retrieving revision 1.6.2.2 diff -u -u -r1.6.2.2 import.html --- import.html 16 Oct 2003 17:04:58 - 1.6.2.2 +++ import.html 7 Jan 2004 17:12:43 - @@ -60,7 +60,7 @@ So if I import for example a idocsbuild.xml/i file named bbuilddocs/b, I can get its path as bant.file.builddocs/b, similarly to the bant.file/b property of the main buildfile.br -Note that builddocs is not the filename, but the @name attribute +Note that builddocs is not the filename, but the name attribute present in the imported project tag.br br bImportant/b: We have not finalized how relative file references -- Yuji Yamano - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
From: Matt Benson [mailto:[EMAIL PROTECTED] Actually the new for task uses a macrodef type approach to avoid the antcall. Maybe Matt, but remember I want to call a target after all. That's what the depends attribute does, albeit without creating a new project. There still is the call thingy, but I'm not fond of it... --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
Actually the new for task uses a macrodef type approach to avoid the antcall. Maybe Matt, but remember I want to call a target after all. That's what the depends attribute does, albeit without creating a new project. There still is the call thingy, but I'm not fond of it... Not sure what call thingy you're talking about... again, from what Peter tells me, the new for works like foreach except without creating a new project. -Matt __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
From: Matt Benson [mailto:[EMAIL PROTECTED] Not sure what call thingy you're talking about... again, from what Peter tells me, the new for works like foreach except without creating a new project. I understand that Matt ;-) BUT, what do I put inside the for? The goal is to call a number of targets whose name match a regexp pattern. Calling a target means either antcall, with the caveat I listed, or Ant-Contrib's call task inherited from Antelope I think, that call's a target without creating a new Project, which opens a can a worm. --DD - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
I understand that Matt ;-) BUT, what do I put inside the for? The goal is to call a number of targets whose name match a regexp pattern. Calling a target means either antcall, with the caveat I listed, or Ant-Contrib's call task inherited from Antelope I think, that call's a target without creating a new Project, which opens a can a worm. Gotcha. Not sure what worms you might be thinking of that would be particularly slimier than any you might encounter in the course of using the suggested core enhancement. As with most things that we wish were in core, the contrib version might be a little unwieldy, but it seems like it should work. I have similar issues with for (I am a proponent of adding its functionality to Ant core) on the rationale that it is a target-centric analogue to apply. Oh well... -Matt __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks touch.html
stevel 2004/01/07 09:49:37
Modified:src/testcases/org/apache/tools/ant/taskdefs TouchTest.java
src/main/org/apache/tools/ant/util FileUtils.java
src/main/org/apache/tools/ant/taskdefs Touch.java
src/etc/testcases/taskdefs touch.xml
docs/manual/CoreTasks touch.html
Log:
touch to handle filelists. Forced me to add more tests for new and existing
touch code, and in the process note that the granularity for unix filesystems
is not 0 but 1000 milliseconds. oops.
PR: 23526
Submitted by: [EMAIL PROTECTED]
Revision ChangesPath
1.2 +86 -1
ant/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java
Index: TouchTest.java
===
RCS file:
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/TouchTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TouchTest.java24 Jun 2003 12:46:57 - 1.1
+++ TouchTest.java7 Jan 2004 17:49:37 - 1.2
@@ -55,9 +55,15 @@
package org.apache.tools.ant.taskdefs;
import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.util.FileUtils;
+
+import java.io.File;
public class TouchTest extends BuildFileTest {
+private static String touchfile=src/etc/testcases/taskdefs/touchtest;
+
public TouchTest(String name) {
super(name);
}
@@ -69,13 +75,23 @@
public void tearDown() {
executeTarget(cleanup);
}
-
+
+public long getTargetTime() {
+
+File file = new File(touchfile);
+if(!file.exists()) {
+throw new BuildException(failed to touch file +touchfile);
+}
+return file.lastModified();
+}
+
/**
* No real test, simply checks whether the dateformat without
* seconds is accepted - by erroring out otherwise.
*/
public void testNoSeconds() {
executeTarget(noSeconds);
+long time = getTargetTime();
}
/**
@@ -84,5 +100,74 @@
*/
public void testSeconds() {
executeTarget(seconds);
+long time=getTargetTime();
+}
+/**
+ * verify that the millis test sets things up
+ */
+public void testMillis() {
+touchFile(testMillis, 1234567);
+}
+
+/**
+ * verify that the default value defaults to now
+ */
+public void testNow() {
+long now=System.currentTimeMillis();
+executeTarget(testNow);
+long time = getTargetTime();
+assertTimesNearlyMatch(time,now,5000);
+}
+/**
+ * verify that the millis test sets things up
+ */
+public void test1970() {
+touchFile(test1970, 0);
+}
+
+/**
+ * test the file list
+ */
+public void testFilelist() {
+touchFile(testFilelist, 10);
+}
+
+/**
+ * test the file set
+ */
+public void testFileset() {
+touchFile(testFileset, 20);
+}
+
+/**
+ * run a target to touch the test file; verify the timestamp is as
expected
+ * @param targetName
+ * @param timestamp
+ */
+private void touchFile(String targetName, long timestamp) {
+executeTarget(targetName);
+long time = getTargetTime();
+assertTimesNearlyMatch(timestamp,time);
+}
+
+/**
+ * assert that two times are within the current FS granularity;
+ * @param timestamp
+ * @param time
+ */
+public void assertTimesNearlyMatch(long timestamp,long time) {
+long granularity=
FileUtils.newFileUtils().getFileTimestampGranularity();
+assertTimesNearlyMatch(timestamp, time, granularity);
+}
+
+/**
+ * assert that two times are within a specified range
+ * @param timestamp
+ * @param time
+ * @param range
+ */
+private void assertTimesNearlyMatch(long timestamp, long time, long
range) {
+assertTrue(Time +timestamp+ is not within +range+ ms of +time,
+Math.abs(time-timestamp)=range);
}
}
1.60 +6 -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.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- FileUtils.java20 Nov 2003 12:08:17 - 1.59
+++ FileUtils.java7 Jan 2004 17:49:37 - 1.60
@@ -116,6 +116,10 @@
*/
public static final long FAT_FILE_TIMESTAMP_GRANULARITY = 2000;
+/**
+ * the granularity of timestamps under Unix
+ */
DO NOT REPLY [Bug 23526] - PATCH: touch should support nested filelist elements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23526. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23526 PATCH: touch should support nested filelist elements [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED Version|1.6.0 |1.7Alpha (nightly) --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 17:50 --- Fixed in CVS. Tests are good too, you know :) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 23526] - PATCH: touch should support nested filelist elements
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23526. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=23526 PATCH: touch should support nested filelist elements --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 17:54 --- The reason I didn't hit the tests is that there were no existing tests for filesets either; sorry for the extra inconvenience. Thanks for your interest. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb JbossDeploymentTool.java
peterreilly2004/01/07 10:17:08
Modified:src/main/org/apache/tools/ant/taskdefs/optional/ejb
JbossDeploymentTool.java
Log:
Change message on lack of cmp decriptor from warning to verbose as
it is optional
PR: 25959
Obtained from: Eric Molitor
Revision ChangesPath
1.19 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
Index: JbossDeploymentTool.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JbossDeploymentTool.java 7 Jan 2004 07:26:48 - 1.18
+++ JbossDeploymentTool.java 7 Jan 2004 18:17:08 - 1.19
@@ -110,7 +110,7 @@
} else {
log(Unable to locate jboss cmp descriptor.
+ It was expected to be in
-+ jbossCMPD.getPath(), Project.MSG_WARN);
++ jbossCMPD.getPath(), Project.MSG_VERBOSE);
return;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb JbossDeploymentTool.java
peterreilly2004/01/07 10:19:50
Modified:src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
ANT_16_BRANCH JbossDeploymentTool.java
Log:
Sync with head
Revision ChangesPath
No revision
No revision
1.16.2.3 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java
Index: JbossDeploymentTool.java
===
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.java,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -u -r1.16.2.2 -r1.16.2.3
--- JbossDeploymentTool.java 7 Jan 2004 07:32:09 - 1.16.2.2
+++ JbossDeploymentTool.java 7 Jan 2004 18:19:50 - 1.16.2.3
@@ -110,7 +110,7 @@
} else {
log(Unable to locate jboss cmp descriptor.
+ It was expected to be in
-+ jbossCMPD.getPath(), Project.MSG_WARN);
++ jbossCMPD.getPath(), Project.MSG_VERBOSE);
return;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25959] - ejbjar task assumes jboss will have a jbosscmp-jdbc.xml file even though its not required (if your not using cmp)
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25959. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25959 ejbjar task assumes jboss will have a jbosscmp-jdbc.xml file even though its not required (if your not using cmp) [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2004-01-07 18:20 --- I changed the log message from a WARNING to a VERBOSE. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks import.html
peterreilly2004/01/07 10:22:37 Modified:docs/manual/CoreTasks import.html Log: Fix typo Obtained from: Yuji Yamano Revision ChangesPath 1.8 +1 -1 ant/docs/manual/CoreTasks/import.html Index: import.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/import.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.html 16 Oct 2003 17:04:01 - 1.7 +++ import.html 7 Jan 2004 18:22:37 - 1.8 @@ -59,7 +59,7 @@ So if I import for example a idocsbuild.xml/i file named bbuilddocs/b, I can get its path as bant.file.builddocs/b, similarly to the bant.file/b property of the main buildfile.br -Note that builddocs is not the filename, but the @name attribute +Note that builddocs is not the filename, but the name attribute present in the imported project tag.br br bImportant/b: We have not finalized how relative file references - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks import.html
peterreilly2004/01/07 10:23:09 Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH import.html Log: Sync with HEAD Revision ChangesPath No revision No revision 1.6.2.3 +1 -1 ant/docs/manual/CoreTasks/import.html Index: import.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/import.html,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- import.html 16 Oct 2003 17:04:58 - 1.6.2.2 +++ import.html 7 Jan 2004 18:23:09 - 1.6.2.3 @@ -60,7 +60,7 @@ So if I import for example a idocsbuild.xml/i file named bbuilddocs/b, I can get its path as bant.file.builddocs/b, similarly to the bant.file/b property of the main buildfile.br -Note that builddocs is not the filename, but the @name attribute +Note that builddocs is not the filename, but the name attribute present in the imported project tag.br br bImportant/b: We have not finalized how relative file references - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: typo
Ta for the report. Should be in 1.6.1 Peter Yuji Yamano wrote: I think it's typo. Index: import.html === RCS file: /home/cvspublic/ant/docs/manual/CoreTasks/import.html,v retrieving revision 1.6.2.2 diff -u -u -r1.6.2.2 import.html --- import.html 16 Oct 2003 17:04:58 - 1.6.2.2 +++ import.html 7 Jan 2004 17:12:43 - @@ -60,7 +60,7 @@ So if I import for example a idocsbuild.xml/i file named bbuilddocs/b, I can get its path as bant.file.builddocs/b, similarly to the bant.file/b property of the main buildfile.br -Note that builddocs is not the filename, but the @name attribute +Note that builddocs is not the filename, but the name attribute present in the imported project tag.br br bImportant/b: We have not finalized how relative file references -- Yuji Yamano - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
Matt Benson wrote: Actually the new for task uses a macrodef type approach to avoid the antcall. Maybe Matt, but remember I want to call a target after all. That's what the depends attribute does, albeit without creating a new project. There still is the call thingy, but I'm not fond of it... Not sure what call thingy you're talking about... again, from what Peter tells me, the new for works like foreach except without creating a new project. Not quite, it does not call targets, but it does run the contents of the sequential block for each value of the parameter. Peter -Matt __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [PATCH] Support for default ProjectHelper to expand propertie s in attributes to project/target tags
ah, yes... even better. :) hard to keep all the permutations straight. When is all that stuff going to be apparent from the ant-contrib site? -Matt --- Peter Reilly [EMAIL PROTECTED] wrote: Matt Benson wrote: Actually the new for task uses a macrodef type approach to avoid the antcall. Maybe Matt, but remember I want to call a target after all. That's what the depends attribute does, albeit without creating a new project. There still is the call thingy, but I'm not fond of it... Not sure what call thingy you're talking about... again, from what Peter tells me, the new for works like foreach except without creating a new project. Not quite, it does not call targets, but it does run the contents of the sequential block for each value of the parameter. Peter -Matt __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Yahoo! Hotjobs: Enter the Signing Bonus Sweepstakes http://hotjobs.sweepstakes.yahoo.com/signingbonus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
