Merge changes from 1.5 branch to HEAD.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273143 13f79535-47bb-0310-9956-ffa450edef68

docs/manual/CoreTasks/copy.html

@@ -117,6 +117,12 @@ tokens in files that are copied.
 <p>The Copy task supports nested <a href="../CoreTypes/filterchain.html">
 FilterChain</a>s.</p>
 
+<p>
+If &lt;filterset&gt; and &lt;filterchain&gt; elements are used inside the
+same &lt;copy&gt; task, all &lt;filterchain&gt; elements are processed first
+followed by &lt;filterset&gt; elements.
+</p>
+
 <h3>Examples</h3>
 <p><b>Copy a single file</b></p>
 <pre>

docs/manual/CoreTasks/move.html

@@ -79,6 +79,13 @@ href="../CoreTypes/mapper.html#identity-mapper">identity</a>.</p>
 <h4>filterchain</h4>
 <p>The Move task supports nested <a href="../CoreTypes/filterchain.html">
 FilterChain</a>s.</p>
+
+<p>
+If &lt;filterset&gt; and &lt;filterchain&gt; elements are used inside the
+same &lt;move&gt; task, all &lt;filterchain&gt; elements are processed first
+followed by &lt;filterset&gt; elements.
+</p>
+
 <h3>Examples</h3>
 <p><b>Move a single file (rename a file)</b></p>
 <pre>

docs/manual/install.html

@@ -17,8 +17,8 @@ href="http://jakarta.apache.org/builds/ant/nightly/">http://jakarta.apache.org/b
 <h3>Source Edition</h3>
 
 <p>If you prefer the source edition, you can download the source for the latest Ant release from <a
-href="http://jakarta.apache.org/builds/ant/release/v1.4.1/src/">
-http://jakarta.apache.org/builds/ant/release/v1.4.1/src/</a>. 
+href="http://jakarta.apache.org/builds/ant/release/v1.5/src/">
+http://jakarta.apache.org/builds/ant/release/v1.5/src/</a>.
 
 Again, if you prefer the edge, you can access 
 the code as it is being developed via CVS. The Jakarta website has details on 
@@ -133,11 +133,7 @@ restrictions on the classes which may be loaded by an extension.</p>
 <h3><a name="optionalTasks">Optional Tasks</a></h3>
 <p>Ant supports a number of optional tasks. An optional task is a task which
 typically requires an external library to function. The optional tasks are 
-packaged separately from the core Ant tasks. This package is available in 
-the same download directory as the core ant distribution. The current 
-jar containing optional tasks is named <code>jakarta-ant-1.4.1-optional.jar</code>.
-This jar should be downloaded and placed in the lib directory of your Ant 
-installation.</p> 
+packaged together with the core Ant tasks.</p>
 
 <p>The external libraries required by each of the optional tasks is detailed
 in the <a href="#librarydependencies">Library Dependencies</a> section. These external

src/main/org/apache/tools/ant/Target.java

@@ -313,11 +313,13 @@ public class Target implements TaskContainer {
                 }
             }
         } else if (!testIfCondition()) {
-            project.log(this, "Skipped because property '" + this.ifCondition 
-                + "' not set.", Project.MSG_VERBOSE);
+            project.log(this, "Skipped because property '" 
+                        + project.replaceProperties(this.ifCondition) 
+                        + "' not set.", Project.MSG_VERBOSE);
         } else {
             project.log(this, "Skipped because property '" 
-                + this.unlessCondition + "' set.", Project.MSG_VERBOSE);
+                        + project.replaceProperties(this.unlessCondition) 
+                        + "' set.", Project.MSG_VERBOSE);
         }
     }