bodewig 2004/05/25 05:12:39
Modified: docs/manual/CoreTasks copy.html
src/main/org/apache/tools/ant/taskdefs Copy.java
src/main/org/apache/tools/ant/util ResourceUtils.java
SourceFileScanner.java
Log:
Push fix for PR#22150 to 1.6.2
Revision Changes Path
1.25 +1 -1 ant/docs/manual/CoreTasks/copy.html
Index: copy.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/copy.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- copy.html 9 Feb 2004 21:50:05 -0000 1.24
+++ copy.html 25 May 2004 12:12:39 -0000 1.25
@@ -136,7 +136,7 @@
millisecond level. Default is 0 milliseconds, or 2 seconds on DOS
systems. This can also be useful if source and target files live
on separate machines with clocks being out of sync. <em>since Ant
- 1.6</em>.</td>
+ 1.6.2</em>.</td>
</tr>
</table>
<h3>Parameters specified as nested elements</h3>
1.72 +2 -2 ant/src/main/org/apache/tools/ant/taskdefs/Copy.java
Index: Copy.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Copy.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Copy.java 9 Mar 2004 16:48:04 -0000 1.71
+++ Copy.java 25 May 2004 12:12:39 -0000 1.72
@@ -335,7 +335,7 @@
*
* <p>Default is 0 milliseconds, or 2 seconds on DOS systems.</p>
*
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public void setGranularity(long granularity) {
this.granularity = granularity;
1.10 +1 -1 ant/src/main/org/apache/tools/ant/util/ResourceUtils.java
Index: ResourceUtils.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/ResourceUtils.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ResourceUtils.java 9 Mar 2004 16:48:52 -0000 1.9
+++ ResourceUtils.java 25 May 2004 12:12:39 -0000 1.10
@@ -71,7 +71,7 @@
* @return array containing the source files which need to be
* copied or processed, because the targets are out of date or do
* not exist
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public static Resource[] selectOutOfDateSources(ProjectComponent logTo,
Resource[] source,
1.27 +2 -2
ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java
Index: SourceFileScanner.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/util/SourceFileScanner.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- SourceFileScanner.java 9 Mar 2004 16:48:52 -0000 1.26
+++ SourceFileScanner.java 25 May 2004 12:12:39 -0000 1.27
@@ -77,7 +77,7 @@
* @param granularity The number of milliseconds leeway to give
* before deciding a target is out of date.
*
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public String[] restrict(String[] files, File srcDir, File destDir,
FileNameMapper mapper, long granularity) {
@@ -120,7 +120,7 @@
* files as File objects (containing absolute paths if srcDir is
* absolute).
*
- * @since Ant 1.6
+ * @since Ant 1.6.2
*/
public File[] restrictAsFiles(String[] files, File srcDir, File destDir,
FileNameMapper mapper, long granularity) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
