peterreilly 2004/12/10 05:21:54 Modified: docs/manual/CoreTasks Tag: ANT_16_BRANCH copy.html src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH Copy.java Log: sync: copy's filenamemapper type support Revision Changes Path No revision No revision 1.19.2.10 +5 -3 ant/docs/manual/CoreTasks/copy.html Index: copy.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v retrieving revision 1.19.2.9 retrieving revision 1.19.2.10 diff -u -r1.19.2.9 -r1.19.2.10 --- copy.html 7 Dec 2004 23:43:22 -0000 1.19.2.9 +++ copy.html 10 Dec 2004 13:21:50 -0000 1.19.2.10 @@ -152,6 +152,10 @@ href="../CoreTypes/mapper.html">mapper</a> element. The default mapper used by <code><copy></code> is the <a href="../CoreTypes/mapper.html#identity-mapper">identity mapper</a>.</p> + <p> + <em>Since Ant 1.6.3</em>, + one can use a filenamemapper type in place of the mapper element. + </p> <h4>filterset</h4> <p><a href="../CoreTypes/filterset.html">FilterSet</a>s are used to replace @@ -200,9 +204,7 @@ <pre> <copy todir="../backup/dir"> <fileset dir="src_dir"/> - <mapper> - <globmapper from="*" to="*.bak"/> - </mapper> + <globmapper from="*" to="*.bak"/> </copy> </pre> No revision No revision 1.66.2.7 +11 -1 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java Index: Copy.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v retrieving revision 1.66.2.6 retrieving revision 1.66.2.7 diff -u -r1.66.2.6 -r1.66.2.7 --- Copy.java 1 Sep 2004 07:02:23 -0000 1.66.2.6 +++ Copy.java 10 Dec 2004 13:21:51 -0000 1.66.2.7 @@ -290,6 +290,16 @@ } /** + * A nested filenamemapper + * @param fileNameMapper the mapper to add + * @since Ant 1.6.3 + */ + public void add(FileNameMapper fileNameMapper) { + createMapper().add(fileNameMapper); + } + + + /** * Sets the character encoding * @param encoding the character encoding * @since 1.32, Ant 1.5
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]