Re: macrodef and local
Jose Alberto Fernandez wrote:
The way I see it, a macrodef let will also solve the issue
of concurrency. Notice that in all this cases the issue is
how do you refer to the value just generated. Lets assume you
have the macro I defined before:
macrodef name=example
attribute name=foo/
let name=basefoo/
sequential
basename property=@{basefoo} file=@{foo}/
echo massage=[EMAIL PROTECTED]/
/sequential
/macrodef
Of course what this is really all about is the design decision for rigid
declarative syntax
in which there is no such thing as a function which returns a string into a
scalar. In effect,
you with your local properties and I with my recursive parsing are struggling
to retrofit
functional programming into Ant without spooking the ideologues :-)
--
Jack J. Woehr # We have gone from the horse and buggy
Senior Consultant # to the moon rocket in one lifetime, but
Purematrix, Inc. # there has not been a corresponding moral
www.purematrix.com # growth in mankind. - Dwight D. Eisenhower
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29484] - [net] Unable to initiate FTP send
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29484. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29484 [net] Unable to initiate FTP send [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2004-06-22 02:58 --- Without knowing the details of the server you're connecting to and how it identifies itself to the outside world, I have to think that this is not a bug and that the code is working as it was intended to. There is a public method FTPClient.setRemoteVerificationEnabled() that can be called to change the default value for this variable to false, and thereby disable the verification. But this code has been stable for many years without getting this complaint. Is it possible the server is misconfigured? Since you're working from Ant, if you can demonstrate that your use case is valid and that there is a vailid reason to be able to turn off the verification, perhaps the Ant FTP task can be revised to take another parameter for this. But that is a matter for Ant. Commons-net does provide a way to change the default if necessary. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: macrodef and local
From: Jack J. Woehr [mailto:[EMAIL PROTECTED]
Jose Alberto Fernandez wrote:
The way I see it, a macrodef let will also solve the issue of
concurrency. Notice that in all this cases the issue is how do you
refer to the value just generated. Lets assume you have the macro I
defined before:
macrodef name=example
attribute name=foo/
let name=basefoo/
sequential
basename property=@{basefoo} file=@{foo}/
echo massage=[EMAIL PROTECTED]/
/sequential
/macrodef
Of course what this is really all about is the design
decision for rigid declarative syntax in which there is no
such thing as a function which returns a string into a
scalar. In effect, you with your local properties and I with
my recursive parsing are struggling to retrofit functional
programming into Ant without spooking the ideologues :-)
As the chief ideologue of the declarative camp that puts me in the spot
:-)
Lets not forget that real functional languages ARE declarative.
I.e.: variable names represent a value at the point they were defined
and you cannot change that value.
What ALL proper declarative languages have that ANT does not is
the concept of local variable (functional let X; prolog's X; lisp's
lambda x)
whose scope is just the local context in which they are mentioned.
Now that we can write recursion (the basic means of computation in any
declarative language) we see the need for such a thing.
But it is not an easy change for ANT because the tasks that manipulate
properties assume they are global. My attempt was to comply with their
assumption and provide them with a global name for them to use.
It is probably not the best solution, but I really fear about the impack
of some of the other proposals on the assumptions that ours and third
party tasks make of how things work.
My macrodef.let tries to provide a syntax for such a local variable
name.
Jose Alberto
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
1.6.2 ?
Just a friendly nudge... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 8689] - AntClassLoader still leaks memory.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=8689. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=8689 AntClassLoader still leaks memory. [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] AssignedTo|[EMAIL PROTECTED] |[EMAIL PROTECTED] Status|REOPENED|NEW --- Additional Comments From [EMAIL PROTECTED] 2004-06-22 13:27 --- Mike, your patch is against Ant.java, not AntClassLoader.java, correct? I see how the sub-build gets a reference to all existing AntClassLoaders and those references never get reset, this is easier to fix without firing any events. I'll look into it. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Ant Wiki] Updated: FrontPage
Date: 2004-06-22T05:32:14 Editor: 217.132.25.176 Wiki: Ant Wiki Page: FrontPage URL: http://wiki.apache.org/ant/FrontPage no comment Change Log: -- @@ -38,4 +38,6 @@ * AntNewbies + * AntWeaknessesAndProblems + * ANT = [A]nother [N]eat [T]ool (as described in the [http://ant.apache.org/faq.html#ant-name FAQ]) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29729] - XSL StyleSheet for build scripts
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29729. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29729 XSL StyleSheet for build scripts --- Additional Comments From [EMAIL PROTECTED] 2004-06-22 07:00 --- Created an attachment (id=11907) Stylesheet for ant build scripts - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29729] - XSL StyleSheet for build scripts
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29729. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29729 XSL StyleSheet for build scripts --- Additional Comments From [EMAIL PROTECTED] 2004-06-22 14:14 --- How/why is this a bug? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: 1.6.2 ?
We have a few more things to get fixed and/or merged over to the 1.6 branch from CVS HEAD. We are getting this done as we are able. -Matt --- [EMAIL PROTECTED] wrote: Just a friendly nudge... - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] __ Do you Yahoo!? Take Yahoo! Mail with you! Get it on your mobile phone. http://mobile.yahoo.com/maildemo - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29731] - jar task 'filesetmanifest=mergewithoutmain' only working on manifest files
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29731. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29731 jar task 'filesetmanifest=mergewithoutmain' only working on manifest files --- Additional Comments From [EMAIL PROTECTED] 2004-06-22 09:06 --- Created an attachment (id=11908) Proposed fix patch against the current CVS checkout - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks delete.html
peterreilly2004/06/22 07:39:36 Modified:.CONTRIBUTORS docs/manual/CoreTasks delete.html Log: delete.html: add example of deleting a directory Obtained from: Ivan Ivanov Revision ChangesPath 1.24 +1 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS === RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- CONTRIBUTORS 11 Jun 2004 20:13:28 - 1.23 +++ CONTRIBUTORS 22 Jun 2004 14:39:36 - 1.24 @@ -70,6 +70,7 @@ Ingenonsya France Ingmar Stein Irene Rusman +Ivan Ivanov Jack J. Woehr James Duncan Davidson Jan Matèrne 1.21 +6 -0 ant/docs/manual/CoreTasks/delete.html Index: delete.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/delete.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- delete.html 8 Jun 2004 16:19:27 - 1.20 +++ delete.html 22 Jun 2004 14:39:36 - 1.21 @@ -159,6 +159,12 @@ /pre pdeletes all files and subdirectories of codebuild/code, including codebuild/code itself./p +pre lt;delete includeemptydirs=quot;truequot;gt; +lt;fileset dir=quot;buildquot; includes=quot;**/*quot;/gt; + lt;/deletegt; +/pre +pdeletes all files and subdirectories of codebuild/code, without +codebuild/code itself./p hrp align=centerCopyright copy; 2000-2002,2004 The Apache Software Foundation. All rights Reserved./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks delete.html
peterreilly2004/06/22 07:44:07 Modified:.Tag: ANT_16_BRANCH CONTRIBUTORS docs/manual/CoreTasks Tag: ANT_16_BRANCH delete.html Log: sync Revision ChangesPath No revision No revision 1.1.2.17 +1 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS === RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -r1.1.2.16 -r1.1.2.17 --- CONTRIBUTORS 11 Jun 2004 21:20:59 - 1.1.2.16 +++ CONTRIBUTORS 22 Jun 2004 14:44:07 - 1.1.2.17 @@ -68,6 +68,7 @@ Holger Engels Ingenonsya France Ingmar Stein +Ivan Ivanov Jack J. Woehr James Duncan Davidson Jan Matèrne No revision No revision 1.18.2.4 +6 -0 ant/docs/manual/CoreTasks/delete.html Index: delete.html === RCS file: /home/cvs/ant/docs/manual/CoreTasks/delete.html,v retrieving revision 1.18.2.3 retrieving revision 1.18.2.4 diff -u -r1.18.2.3 -r1.18.2.4 --- delete.html 8 Jun 2004 16:20:28 - 1.18.2.3 +++ delete.html 22 Jun 2004 14:44:07 - 1.18.2.4 @@ -160,6 +160,12 @@ /pre pdeletes all files and subdirectories of codebuild/code, including codebuild/code itself./p +pre lt;delete includeemptydirs=quot;truequot;gt; +lt;fileset dir=quot;buildquot; includes=quot;**/*quot;/gt; + lt;/deletegt; +/pre +pdeletes all files and subdirectories of codebuild/code, without +codebuild/code itself./p hrp align=centerCopyright copy; 2000-2002,2004 The Apache Software Foundation. All rights Reserved./p - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Ant Wiki] New: CheckStyle
Date: 2004-06-22T08:23:15 Editor: 167.68.1.67 Wiki: Ant Wiki Page: CheckStyle URL: http://wiki.apache.org/ant/CheckStyle Created page, using text from Checkstyle's home page; added link to home page. New Page: Checkstyle is a development tool to help programmers write Java code that adheres to a coding standard. It automates the process of checking Java code to spare humans of this boring (but important) task. This makes it ideal for projects that want to enforce a coding standard. Checkstyle is highly configurable and can be made to support almost any coding standard. An example configuration file is supplied supporting the Sun Code Conventions. As well, other sample configuration files are supplied for other well known conventions. Checkstyle's distribution includes an Ant task. See http://checkstyle.sourceforge.net/ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29742] New: - Modified selector doesn't allow algorithm or comparator selection
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29742. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29742 Modified selector doesn't allow algorithm or comparator selection Summary: Modified selector doesn't allow algorithm or comparator selection Product: Ant Version: 1.6.1 Platform: All OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Core AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] As documented, the modified selector provides two algorithms and two comparators. The algorithms are digest and hashvalue with digest being the default. The two comparators are equal and rule with equal being the default. A bug in the algorithm and comparator initialization logic disallows the user from choosing anything but the default choices. The digest algorithm and the equal comparator will always be utilized. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 29743] New: - modified selector has poor cachefile save performance
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=29743. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=29743 modified selector has poor cachefile save performance Summary: modified selector has poor cachefile save performance Product: Ant Version: 1.6.1 Platform: All OS/Version: All Status: NEW Severity: Enhancement Priority: Other Component: Core AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] CC: [EMAIL PROTECTED] The modified selector has the default behavior of saving cache information to a propertiesfile when a change to a file is recognized. This file comparison is performed when the isSelected(File basedir, String filename, File file) method is called upon the selector. It is at this point that the propertiesfile will be updated ( rewritten ). The propertiesfile will be rewritten every time a modified file is found. When working with large filesets that have many changes, in my case 15000, this leads to poor performance as the properties file is rewritten many times ( up to 15000 times in my case ). I would like to be able to delay the writing of this file til some later point, after multiple changes are found. Unfortunately, the selector framework really only understands the context of one file, through the isSelected method. A selector does not know when we are finished processing a fileset or possibly finished with the selector all together ( unless I am missing a piece in the selector architecture ). A possibility is to add one or more methods to BaseSelector, that a custom selector could override. In the case of the modified selector, we may be able to get away with knowing we are finished with the selector through some method call like tearDown. At this point, the modified selector could save its properites file. Another option is to add filesetListener type of behavior to the BaseSelector. This would notify a selector when a fileset selection has started and ended. With this option, the modified selector could save its properties file and the end of fileset selection. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Issues with modified / selector.
Recently, I submitted two bugs related to the modified selector. Bug 29742 addresses the issue that the Modified selector doesn't allow algorithm or comparator selection. Only the default choices of digest and equal respectively are allowed. I have created a bug fix for the modified selector that addresses this issue. In the bug fix, the algorithm and comparator initialization logic has been changed to allow choosing away from default. At the same time, I have created another algorithm type, checksum, that makes use of the java.util.zip.Checksum interface. It is chosen by setting the alogrithm attribute to checksum ( modified algorithm=checksum / ). This checksum allows the choice of CRC32 or Alder32, which utilize java.util.zip.CRC32 and java.util.zip.Adler32 respectively. This choice is made by setting the algorithm.algorithm parameter to CRC or ADLER, with the default being CRC ( modified algorithm=checksumparam name=algorithm.algorithm value=ADLER //modified ) How do I submit such changes for evaluation and possible inclusion? Bug 29743 addresses a bigger issue in that the modified selector has poor cachefile save performance. The architecture of the selector framework dictates that the selector is notified of files, one at a time, through the isSelected method. It is at this method call, that the cache properties file is saved. This properties file is saved every time a file modification is found, possibly as many times as there are files in the fileset. This leads to poor performance when process large filesets with multiple changes, in my case around 15000. I would like to delay the saving of the file until we are finished with the fileset or finished with the selector. It looks to me, like this requires the addition of one of more methods to the selector framework, likely to BaseSelector. In the case of the modified selector, we may be able to get away with knowing we are finished with the selector through some method call like tearDown. At this point, the modified selector could save its properites file. Another option is to add filesetListener type of behavior to the BaseSelector. This would notify a selector when a fileset selection has started and ended. With this option, the modified selector could save its properties file at the end of fileset selection. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Issues with modified / selector.
--- Robert Rice [EMAIL PROTECTED] wrote: Recently, I submitted two bugs related to the modified selector. [SNIP] How do I submit such changes for evaluation and possible inclusion? That was how. -Matt __ Do you Yahoo!? Yahoo! Mail - 50x more storage than other providers! http://promotions.yahoo.com/new_mail - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs LoadPropertiesTest.java
mbenson 2004/06/22 12:34:54
Modified:.Tag: ANT_16_BRANCH TODO WHATSNEW
docs/manual/CoreTasks Tag: ANT_16_BRANCH loadproperties.html
src/etc/testcases/taskdefs Tag: ANT_16_BRANCH
loadproperties.xml
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
LoadProperties.java
src/testcases/org/apache/tools/ant/taskdefs Tag:
ANT_16_BRANCH LoadPropertiesTest.java
Log:
merge loadproperties from resource from HEAD
Revision ChangesPath
No revision
No revision
1.3.2.18 +0 -2 ant/Attic/TODO
Index: TODO
===
RCS file: /home/cvs/ant/Attic/TODO,v
retrieving revision 1.3.2.17
retrieving revision 1.3.2.18
diff -u -r1.3.2.17 -r1.3.2.18
--- TODO 21 Jun 2004 22:15:05 - 1.3.2.17
+++ TODO 22 Jun 2004 19:34:54 - 1.3.2.18
@@ -9,8 +9,6 @@
* merge redirectors from HEAD [Matt]
-* merge loadproperties from resource from HEAD [Matt]
-
* merge apply differentiates between empty up-to-date from HEAD [Matt]
* Fix or at least document support for tomcat 5.0 jsp
1.503.2.108 +2 -0 ant/WHATSNEW
Index: WHATSNEW
===
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.107
retrieving revision 1.503.2.108
diff -u -r1.503.2.107 -r1.503.2.108
--- WHATSNEW 21 Jun 2004 22:15:05 - 1.503.2.107
+++ WHATSNEW 22 Jun 2004 19:34:54 - 1.503.2.108
@@ -201,6 +201,8 @@
* fail accepts a nested condition.
+* loadproperties supports loading from a resource.
+
Changes from Ant 1.6.0 to Ant 1.6.1
=
No revision
No revision
1.6.2.3 +20 -3 ant/docs/manual/CoreTasks/loadproperties.html
Index: loadproperties.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/loadproperties.html,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- loadproperties.html 9 Feb 2004 22:12:07 - 1.6.2.2
+++ loadproperties.html 22 Jun 2004 19:34:54 - 1.6.2.3
@@ -11,7 +11,7 @@
h3Description/h3
p
Load a file's contents as Ant properties. This is equivalent
-to lt;property file=quot;...quot;/gt; except that it
+to lt;property file|resource=quot;...quot;/gt; except that it
supports nested lt;filterchaingt; elements.
/p
@@ -30,17 +30,34 @@
tr
td valign=topsrcFile/td
td valign=topsource file/td
-td valign=top align=centerYes/td
+td valign=top rowspan=2 align=centerOne of these/td
+ /tr
+ tr
+td valign=topresource/td
+td valign=topthe resource name of the property file/td
/tr
tr
td valign=topencoding/td
td valign=topencoding to use when loading the file/td
td align=center valign=topNo/td
/tr
+ tr
+td valign=topclasspath/td
+td valign=topthe classpath to use when looking up a resource./td
+td align=center valign=topNo/td
+ /tr
+ tr
+td valign=topclasspathref/td
+td valign=topthe classpath to use when looking up a resource,
+ given as a href=../using.html#referencesreference/a
+ to a lt;pathgt; defined elsewhere../td
+td align=center valign=topNo/td
+ /tr
/table
p
The LoadProperties task supports nested a
href=../CoreTypes/filterchain.html
-FilterChain/as.
+FilterChain/as, as well as a nested codelt;classpathgt;/code
+element for use with the iresource/i attribute.
h3Examples/h3
prelt;loadproperties srcFile=file.properties/gt;
No revision
No revision
1.1.4.1 +23 -0 ant/src/etc/testcases/taskdefs/loadproperties.xml
Index: loadproperties.xml
===
RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/loadproperties.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- loadproperties.xml8 Mar 2002 02:02:20 - 1.1
+++ loadproperties.xml22 Jun 2004 19:34:54 - 1.1.4.1
@@ -30,6 +30,29 @@
value=http://${server1.http.server}:${server1.http.port}/
/target
+ target name=testPropertiesFromResource depends=init
+echo file=properties.tmp
+#tpfr.a=a
+tpfr.a=A
+tpfr.b=b\
+ e
[EMAIL PROTECTED]@
+/echo
+loadproperties resource=properties.tmp classpath=${basedir}
+ filterchain
+replacetokens
+ token key=C value=sea/
+/replacetokens
+ /filterchain
+/loadproperties
+
cvs commit: ant WHATSNEW
mbenson 2004/06/22 12:36:09 Modified:.Tag: ANT_16_BRANCH WHATSNEW Log: Added Bugzilla pointer for loadproperties resource=... / Revision ChangesPath No revision No revision 1.503.2.109 +1 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.108 retrieving revision 1.503.2.109 diff -u -r1.503.2.108 -r1.503.2.109 --- WHATSNEW 22 Jun 2004 19:34:54 - 1.503.2.108 +++ WHATSNEW 22 Jun 2004 19:36:09 - 1.503.2.109 @@ -202,6 +202,7 @@ * fail accepts a nested condition. * loadproperties supports loading from a resource. + Bugzilla Report 28340. 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
mbenson 2004/06/22 12:38:02 Modified:.WHATSNEW Log: loadproperties resource=... / merged. Revision ChangesPath 1.627 +3 -2 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.626 retrieving revision 1.627 diff -u -r1.626 -r1.627 --- WHATSNEW 21 Jun 2004 22:16:45 - 1.626 +++ WHATSNEW 22 Jun 2004 19:38:02 - 1.627 @@ -24,8 +24,6 @@ * New redirector type introduced to provide extreme I/O flexibility. Initial support for exec, apply, and java tasks. -* loadproperties supports loading from a resource. - * Changed default tempdir for javac from user.dir to java.io.tmpdir. * A new base class DispatchTask has been added to facilitate elegant @@ -237,6 +235,9 @@ status back to the command line. * fail accepts a nested condition. + +* loadproperties supports loading from a resource. + Bugzilla Report 28340. Changes from Ant 1.6.0 to Ant 1.6.1 = - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Ant Wiki] Updated: FrontPage
Date: 2004-06-22T12:51:22 Editor: 167.230.38.107 Wiki: Ant Wiki Page: FrontPage URL: http://wiki.apache.org/ant/FrontPage no comment Change Log: -- @@ -1,6 +1,6 @@ ##language:en #pragma section-numbers off -= Welcome to the Ant Wiki = += Welcome to the Ant Wiki kishore= The Ant Wiki has been migrated from its old home on nagoya.apache.org to part of the Apache Wiki Farm. If you find any issues, feel free to fix them up. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[Ant Wiki] Updated: FrontPage
Date: 2004-06-22T12:52:26 Editor: 167.230.38.107 Wiki: Ant Wiki Page: FrontPage URL: http://wiki.apache.org/ant/FrontPage no comment Change Log: -- @@ -1,6 +1,6 @@ ##language:en #pragma section-numbers off -= Welcome to the Ant Wiki kishore= += Welcome to the Ant Wiki = The Ant Wiki has been migrated from its old home on nagoya.apache.org to part of the Apache Wiki Farm. If you find any issues, feel free to fix them up. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/src/testcases/org/apache/tools/ant/types MapperTest.java
mbenson 2004/06/22 14:30:56 Modified:.Tag: ANT_16_BRANCH TODO WHATSNEW docs/manual/CoreTypes Tag: ANT_16_BRANCH mapper.html src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH Mapper.java defaults.properties src/testcases/org/apache/tools/ant/types Tag: ANT_16_BRANCH MapperTest.java Added: src/main/org/apache/tools/ant/util Tag: ANT_16_BRANCH ChainedMapper.java CompositeMapper.java ContainerMapper.java Log: merge nested and container mappers from HEAD Revision ChangesPath No revision No revision 1.3.2.19 +0 -2 ant/Attic/TODO Index: TODO === RCS file: /home/cvs/ant/Attic/TODO,v retrieving revision 1.3.2.18 retrieving revision 1.3.2.19 diff -u -r1.3.2.18 -r1.3.2.19 --- TODO 22 Jun 2004 19:34:54 - 1.3.2.18 +++ TODO 22 Jun 2004 21:30:55 - 1.3.2.19 @@ -5,8 +5,6 @@ anybody else (assignments look like [Stefan]) to yourself - and please remove items from this list once they are complete. -* merge nested and container mappers from HEAD [Matt] - * merge redirectors from HEAD [Matt] * merge apply differentiates between empty up-to-date from HEAD [Matt] 1.503.2.110 +5 -0 ant/WHATSNEW Index: WHATSNEW === RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.109 retrieving revision 1.503.2.110 diff -u -r1.503.2.109 -r1.503.2.110 --- WHATSNEW 22 Jun 2004 19:36:09 - 1.503.2.109 +++ WHATSNEW 22 Jun 2004 21:30:55 - 1.503.2.110 @@ -204,6 +204,11 @@ * loadproperties supports loading from a resource. Bugzilla Report 28340. +* Nested file mappers and a container mapper implementation have been + introduced. Additionally, the mapper element now accepts defined + nested FileNameMapper implementations directly, allowing a usage + comparable to those of condition, filter, and selector. + Changes from Ant 1.6.0 to Ant 1.6.1 = No revision No revision 1.13.2.4 +96 -7 ant/docs/manual/CoreTypes/mapper.html Index: mapper.html === RCS file: /home/cvs/ant/docs/manual/CoreTypes/mapper.html,v retrieving revision 1.13.2.3 retrieving revision 1.13.2.4 diff -u -r1.13.2.3 -r1.13.2.4 --- mapper.html 9 Feb 2004 22:12:10 - 1.13.2.3 +++ mapper.html 22 Jun 2004 21:30:56 - 1.13.2.4 @@ -33,7 +33,7 @@ tr td valign=toptype/td td valign=topspecifies one of the built-in implementations./td -td rowspan=2 align=center valign=middleExactly one of both/td +td rowspan=2 align=center valign=middleExactly one of these/td /tr tr td valign=topclassname/td @@ -72,14 +72,29 @@ pThe classpath can be specified via a nested codelt;classpathgt;/code, as well - that is, a a href=../using.html#pathpath/a-like structure./p +pbSince Ant 1.6.2,/b nested File Mappers can +be supplied via either CODElt;mappergt;/CODE elements or +a href=../CoreTasks/typedef.htmlcodelt;typedefgt;/code/a'd +implementations of CODEorg.apache.tools.ant.util.FileNameMapper/CODE. +If nested File Mappers are specified by either means, the mapper will be +implicitly configured as a a href=#composite-mappercomposite mapper/a. +/p +hr/ h3The built-in mapper types are:/h3 pAll built-in mappers are case-sensitive./p +pbAs of Ant 1.6.2,/b each of the built-in mapper implementation + types is directly accessible using a specific tagname. This makes it + possible for filename mappers to support attributes in addition to + the generally available ito/i and ifrom/i.br/ + The codelt;mapper type|classname=quot;...quot;gt;/code usage + form remains valid for reasons of backward compatibility./p h4a name=identity-mapperidentity/a/h4 pThe target file name is identical to the source file name. Both codeto/code and codefrom/code will be ignored./p bExamples:/b blockquotepre lt;mapper type=quot;identityquot;/gt; +lt;identitymapper /gt; /pre/blockquote table border=1 cellpadding=2 cellspacing=0 tr @@ -110,6 +125,7 @@ bExamples:/b blockquotepre lt;mapper type=quot;flattenquot;/gt; +lt;flattenmapper /gt; /pre/blockquote table border=1 cellpadding=2 cellspacing=0 tr @@ -139,6 +155,7 @@ h5Examples:/h5 blockquotepre lt;mapper type=quot;mergequot; to=quot;archive.tarquot;/gt; +lt;mergemapper to=quot;archive.tarquot;/gt; /pre/blockquote table border=1 cellpadding=2 cellspacing=0 tr @@ -173,6 +190,7 @@
cvs commit: ant CONTRIBUTORS
mbenson 2004/06/22 14:51:12 Modified:.Tag: ANT_16_BRANCH CONTRIBUTORS Log: Adding contributors of patches I've applied to HEAD and merged later. Revision ChangesPath No revision No revision 1.1.2.18 +6 -0 ant/CONTRIBUTORS Index: CONTRIBUTORS === RCS file: /home/cvs/ant/CONTRIBUTORS,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -r1.1.2.17 -r1.1.2.18 --- CONTRIBUTORS 22 Jun 2004 14:44:07 - 1.1.2.17 +++ CONTRIBUTORS 22 Jun 2004 21:51:12 - 1.1.2.18 @@ -33,9 +33,11 @@ Cyrille Morvan Dale Anson Dan Armbrust +Daniel Spilker Danno Ferrin Davanum Srinivas David A. Herman +David Kavanagh David Maclean David Rees Denis Hennessy @@ -68,6 +70,7 @@ Holger Engels Ingenonsya France Ingmar Stein +Irene Rusman Ivan Ivanov Jack J. Woehr James Duncan Davidson @@ -136,6 +139,7 @@ mnowostawski Nick Chalko Nick Fortescue +Nick Gianakas Nick Pellow Nicola Ken Barozzi Nico Seessle @@ -153,6 +157,7 @@ Pierre Delisle Pierre Dittgen R Handerson +Rainer Noack Rami Ojares Randy Watler Raphael Pierquin @@ -196,4 +201,5 @@ Wolfgang Werner Wolf Siberski Yohann Roussel +Yuji Yamano Zdenek Wagner - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: ant/docs/manual/CoreTasks echo.html
mbenson 2004/06/22 14:59:05
Modified:docs/manual/CoreTasks Tag: ANT_16_BRANCH echo.html
Log:
Sync with HEAD.
Revision ChangesPath
No revision
No revision
1.10.2.3 +11 -3 ant/docs/manual/CoreTasks/echo.html
Index: echo.html
===
RCS file: /home/cvs/ant/docs/manual/CoreTasks/echo.html,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -r1.10.2.2 -r1.10.2.3
--- echo.html 9 Feb 2004 22:12:07 - 1.10.2.2
+++ echo.html 22 Jun 2004 21:59:05 - 1.10.2.3
@@ -52,13 +52,21 @@
/table
h3Examples/h3
-pre lt;echo message=quot;Hello, worldquot;/gt;/pre
-pre
+pre
+lt;echo message=quot;Hello, worldquot;/gt;
+/pre
+pre
+lt;echo message=quot;Embed a line break:${line.separator}quot;/gt;
+/pre
+pre
+lt;echogt;Embed another:${line.separator}lt;/echogt;
+/pre
+pre
lt;echogt;This is a longer message stretching over
two lines.
lt;/echogt;
/pre
-pre
+pre
lt;echogt;
This is a longer message stretching over
three lines; the first line is a blank
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
