ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1683458 [1/2] - in /ant/site/ant: production/ production/manual/ production/manual/Tasks/ production/manual/Types/ sources/
Date Thu, 04 Jun 2015 04:01:25 GMT
Author: bodewig
Date: Thu Jun  4 04:01:24 2015
New Revision: 1683458

URL: http://svn.apache.org/r1683458
Log:
Ant 1.9.5

Modified:
    ant/site/ant/production/antnews.html
    ant/site/ant/production/bindownload.html
    ant/site/ant/production/doap_Ant.rdf
    ant/site/ant/production/faq.html
    ant/site/ant/production/index.html
    ant/site/ant/production/legal.html
    ant/site/ant/production/manual/Tasks/ccm.html
    ant/site/ant/production/manual/Tasks/ear.html
    ant/site/ant/production/manual/Tasks/get.html
    ant/site/ant/production/manual/Tasks/javac.html
    ant/site/ant/production/manual/Tasks/javadoc.html
    ant/site/ant/production/manual/Tasks/junit.html
    ant/site/ant/production/manual/Tasks/junitreport.html
    ant/site/ant/production/manual/Tasks/mail.html
    ant/site/ant/production/manual/Tasks/property.html
    ant/site/ant/production/manual/Tasks/propertyfile.html
    ant/site/ant/production/manual/Tasks/scp.html
    ant/site/ant/production/manual/Tasks/signjar.html
    ant/site/ant/production/manual/Tasks/style.html
    ant/site/ant/production/manual/Tasks/tar.html
    ant/site/ant/production/manual/Tasks/unzip.html
    ant/site/ant/production/manual/Types/dirset.html
    ant/site/ant/production/manual/Types/fileset.html
    ant/site/ant/production/manual/Types/filterchain.html
    ant/site/ant/production/manual/Types/multirootfileset.html
    ant/site/ant/production/manual/Types/patternset.html
    ant/site/ant/production/manual/Types/propertyset.html
    ant/site/ant/production/manual/Types/resources.html
    ant/site/ant/production/manual/Types/selectors.html
    ant/site/ant/production/manual/Types/tarfileset.html
    ant/site/ant/production/manual/Types/zipfileset.html
    ant/site/ant/production/manual/argumentprocessor.html
    ant/site/ant/production/manual/cover.html
    ant/site/ant/production/manual/credits.html
    ant/site/ant/production/manual/develop.html
    ant/site/ant/production/manual/install.html
    ant/site/ant/production/manual/listeners.html
    ant/site/ant/production/manual/properties.html
    ant/site/ant/production/manual/running.html
    ant/site/ant/production/manual/tutorial-tasks-filesets-properties.html
    ant/site/ant/production/manual/using.html
    ant/site/ant/production/manualdownload.html
    ant/site/ant/production/srcdownload.html
    ant/site/ant/sources/antnews.xml
    ant/site/ant/sources/bindownload.xml
    ant/site/ant/sources/faq.xml
    ant/site/ant/sources/index.xml
    ant/site/ant/sources/legal.xml
    ant/site/ant/sources/manualdownload.xml
    ant/site/ant/sources/srcdownload.xml

Modified: ant/site/ant/production/antnews.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/antnews.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/antnews.html (original)
+++ ant/site/ant/production/antnews.html Thu Jun  4 04:01:24 2015
@@ -214,6 +214,16 @@
   <div class="content">
     <h1 class="title">Apache Ant&#x2122; Project News</h1>
             <h3 class="section">
+      <a name="Apache Ant 1.9.5"></a>
+      Apache Ant 1.9.5
+    </h3>
+                        <h3>Jun 3, 2015 - Apache Ant 1.9.5 Released</h3>
+                                <p>Apache Ant 1.9.5 is now available for download as source or
+      binary from
+      <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
+                                <p>Ant 1.9.5 contains several bug fixes and improvements compared to Ant 1.9.4,
+      most importantly bug in the &lt;tar&gt; family of tasks and types.</p>
+                        <h3 class="section">
       <a name="Migration to Git"></a>
       Migration to Git
     </h3>

Modified: ant/site/ant/production/bindownload.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/bindownload.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/bindownload.html (original)
+++ ant/site/ant/production/bindownload.html Thu Jun  4 04:01:24 2015
@@ -259,11 +259,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Ant"></a>
       Current Release of Ant
     </h3>
-                        <p>Currently, Apache Ant 1.9.4 is the best available version, see the
+                        <p>Currently, Apache Ant 1.9.5 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.4 was released on 05-May-2014 and
+<div class="content">Ant 1.9.5 was released on 03-Jun-2015 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -274,25 +274,25 @@ may not be available on all mirrors for
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.4-bin.zip">apache-ant-1.9.4-bin.zip</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.5-bin.zip">apache-ant-1.9.5-bin.zip</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.4-bin.tar.gz">apache-ant-1.9.4-bin.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.5-bin.tar.gz">apache-ant-1.9.5-bin.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/binaries/apache-ant-1.9.4-bin.tar.bz2">apache-ant-1.9.4-bin.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.4-bin.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/binaries/apache-ant-1.9.5-bin.tar.bz2">apache-ant-1.9.5-bin.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/binaries/apache-ant-1.9.5-bin.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
@@ -315,17 +315,17 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.4-bin.tar.gz.asc<br />
+% pgpv apache-ant-1.9.5-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.4-bin.tar.gz.asc<br />
+% pgp apache-ant-1.9.5-bin.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.4-bin.tar.gz.asc
+% gpg --verify apache-ant-1.9.5-bin.tar.gz.asc
 </code></p>
                                 <p>A command line version of <a href="http://www.gnupg.org/download/">GnuPG</a> 
 is also available for Windows users.  Follow the 

Modified: ant/site/ant/production/doap_Ant.rdf
URL: http://svn.apache.org/viewvc/ant/site/ant/production/doap_Ant.rdf?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/doap_Ant.rdf (original)
+++ ant/site/ant/production/doap_Ant.rdf Thu Jun  4 04:01:24 2015
@@ -35,6 +35,20 @@
     <category rdf:resource="http://projects.apache.org/category/build-management" />
     <release>
       <Version>
+        <name>Apache Ant 1.9.5</name>
+        <created>2015-06-03</created>
+        <revision>1.9.5</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
+        <name>Apache Ant 1.9.4</name>
+        <created>2014-05-05</created>
+        <revision>1.9.4</revision>
+      </Version>
+    </release>
+    <release>
+      <Version>
         <name>Apache Ant 1.9.3</name>
         <created>2013-12-29</created>
         <revision>1.9.3</revision>

Modified: ant/site/ant/production/faq.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/faq.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/faq.html (original)
+++ ant/site/ant/production/faq.html Thu Jun  4 04:01:24 2015
@@ -827,6 +827,16 @@
           05 May 2014
       </td>
       </tr>
+                  <tr>
+                      <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          1.9.5
+      </td>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          03 Jun 2015
+      </td>
+      </tr>
           </table>
                                 <p class="faq">
       <a name="java-version"></a>

Modified: ant/site/ant/production/index.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/index.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/index.html (original)
+++ ant/site/ant/production/index.html Thu Jun  4 04:01:24 2015
@@ -210,17 +210,6 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Migration to Git"></a>
-      Migration to Git
-    </h3>
-                        <h3>May 23d, 2014 - Apache Ant's family of projects migrates to git on https://git-wip-us.apache.org/repos/asf</h3>
-                                <p>The Apache Ant family of projects migrates to git hosted by the Apache Software Foundation's infrastructure on
-      https://git-wip-us.apache.org/repos/asf.</p>
-                                <p>The source code of Apache Ant, Ivy, Ivyde, the Antlibs and EasyAnt
-    Are all migrated to Git.
-    We are keeping our web site in Subversion, as well as the sandbox.
-  </p>
-                        <h3 class="section">
       <a name="Apache Ant&amp;#x2122;"></a>
       Apache Ant&#x2122;
     </h3>
@@ -252,17 +241,15 @@
           the <a href="http://www.apache.org/">Apache Software
           Foundation</a>.</p>
                         <h3 class="section">
-      <a name="Apache Ant 1.9.4"></a>
-      Apache Ant 1.9.4
+      <a name="Apache Ant 1.9.5"></a>
+      Apache Ant 1.9.5
     </h3>
-                        <h3>May 5, 2014 - Apache Ant 1.9.4 Released</h3>
-                                <p>Apache Ant 1.9.4 is now available for download as source or
+                        <h3>Jun 3, 2015 - Apache Ant 1.9.5 Released</h3>
+                                <p>Apache Ant 1.9.5 is now available for download as source or
       binary from
       <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
-                                <p>Ant 1.9.4 contains several bug fixes and improvements compared to Ant 1.9.3,
-      including the initial support for Java 1.9,
-      the possibility to run JUnit tests in multiple threads (when they are forked)
-      and the refactoring of Ant's own test suite which is now based on JUnit 4.</p>
+                                <p>Ant 1.9.5 contains several bug fixes and improvements compared to Ant 1.9.4,
+      most importantly bug in the &lt;tar&gt; family of tasks and types.</p>
                         <h3 class="section">
       <a name="Apache IvyDE 2.2.0"></a>
       Apache IvyDE 2.2.0
@@ -343,7 +330,7 @@
       Documentation
     </h3>
                         <p>
-You can view the documentation for the current release (Apache Ant 1.9.0)
+You can view the documentation for the current release (Apache Ant 1.9.5)
 <a href="manual/index.html">online</a>
 </p>
                                 <p>

Modified: ant/site/ant/production/legal.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/legal.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/legal.html (original)
+++ ant/site/ant/production/legal.html Thu Jun  4 04:01:24 2015
@@ -211,7 +211,7 @@
       <a name="Legal Stuff They Make Us Say"></a>
       Legal Stuff They Make Us Say
     </h3>
-                        <p>All material on this website is Copyright © 1999-2014,
+                        <p>All material on this website is Copyright © 1999-2015,
       The Apache Software Foundation.</p>
                                 <p>Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather
       logo, and the Apache Ant project logos are trademarks of The

Modified: ant/site/ant/production/manual/Tasks/ccm.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/ccm.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/ccm.html (original)
+++ ant/site/ant/production/manual/Tasks/ccm.html Thu Jun  4 04:01:24 2015
@@ -35,7 +35,6 @@
 
 <p>These Apache Ant tasks are wrappers around Continuus Source Manager. They have been tested
   against versions 5.1/6.2 on Windows 2000, but should work on other platforms with ccm installed.</p>
-<p>author: <a href="mailto:benoit.moussaud@criltelecom.com">Benoit Moussaud (benoit.moussaud@criltelecom.com) </a></p>
 <hr>
 <h2><a name="ccmcheckin">CCMCheckin</a></h2>
 <h3>Description</h3>

Modified: ant/site/ant/production/manual/Tasks/ear.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/ear.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/ear.html (original)
+++ ant/site/ant/production/manual/Tasks/ear.html Thu Jun  4 04:01:24 2015
@@ -258,7 +258,7 @@ to a value other than its default, <code
   </tr>
   <tr>
     <td valign="top">flattenAttributes</td>
-    <td valign="top">Whether to merge attributes occuring more than
+    <td valign="top">Whether to merge attributes occurring more than
       once in a section (this can only happen for the Class-Path
       attribute) into a single attribute.
       <em>Since Ant 1.8.0</em>.</td>

Modified: ant/site/ant/production/manual/Tasks/get.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/get.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/get.html (original)
+++ ant/site/ant/production/manual/Tasks/get.html Thu Jun  4 04:01:24 2015
@@ -134,6 +134,15 @@ plain text' authentication is used. This
       <em>since Ant 1.9.3</em></td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">tryGzipEncoding</td>
+    <td valign="top">When set to true Ant will tell the server it is
+      willing to accept gzip encoding to reduce the amount of data to
+      transfer and uncompress the content transparently.<br/>
+      Setting this to true also means Ant will uncompress
+      <code>.tar.gz</code> and similar files automatically.<br/>
+      <em>since Ant 1.9.5</em></td>
+    <td align="center" valign="top">No; default "false"</td>
 </table>
 <h3>Parameters specified as nested elements</h3>
 <h4>any resource collection</h4>

Modified: ant/site/ant/production/manual/Tasks/javac.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/javac.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/javac.html (original)
+++ ant/site/ant/production/manual/Tasks/javac.html Thu Jun  4 04:01:24 2015
@@ -72,13 +72,14 @@ attribute are:</a></p>
   <li><code>classic</code> (the standard compiler of JDK 1.1/1.2) &ndash;
       <code>javac1.1</code> and
       <code>javac1.2</code> can be used as aliases.</li>
-  <li><code>modern</code> (the standard compiler of JDK 1.3/1.4/1.5/1.6/1.7/1.8) &ndash;
+  <li><code>modern</code> (the standard compiler of JDK 1.3 and later) &ndash;
       <code>javac1.3</code> and
       <code>javac1.4</code> and
       <code>javac1.5</code> and
       <code>javac1.6</code> and
       <code>javac1.7</code> (<em>since Ant 1.8.2</em>) and
-      <code>javac1.8</code> (<em>since Ant 1.8.3</em>) can be used as aliases.</li>
+      <code>javac1.8</code> (<em>since Ant 1.8.3</em>) and</li>
+      <code>javac1.9</code> (<em>since Ant 1.9.5</em>) can be used as aliases.</li>
   <li><code>jikes</code> (the <a
     href="http://jikes.sourceforge.net/" target="_top">Jikes</a>
     compiler).</li>
@@ -428,11 +429,11 @@ invoking the compiler.</p>
       The default value of this is "true" and this
       means that previously compiled classes are on
       the classpath for the compiler. This means that "greedy" compilers
-      will not recompile dependant classes that are already compiled.
+      will not recompile dependent classes that are already compiled.
       In general this is a good thing as it stops the compiler
       for doing unnecessary work. However, for some edge cases,
       involving generics, the javac compiler
-      needs to compile the dependant classes to get the generics
+      needs to compile the dependent classes to get the generics
       information. One example is documented in the bug report:
       <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40776">
         Bug 40776 - a problem compiling a Java 5 project with generics</a>.

Modified: ant/site/ant/production/manual/Tasks/javadoc.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/javadoc.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/javadoc.html (original)
+++ ant/site/ant/production/manual/Tasks/javadoc.html Thu Jun  4 04:01:24 2015
@@ -80,24 +80,12 @@ to &lt;javadoc&gt; using <tt>classpath</
   excludepackagenames attribute won't have any effect unless it agrees
   with the exclude patterns of the packageset (and vice versa).</p>
 
-<p><b>Note:</b> javadocs created by Oracle JDKs prior to Java 7 update
-  25 contain a frane injection security vulnerability - for more
-  information
-  see <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1571"
-  target="_blank">CVE-2013-1571</a>.  Oracle provides a tool that can
-  post-process javadocs, alternatively you can use the macrodef
-  provided as part
-  of <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=55132"
-  target="_blank">Issue 55132</a> in order to fix the generated
-  documents.  The macrodef is reproduced at
-  the <a href="#CVE-2013-1571-macrodef">bottom</a>.</p>
-
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
     <td valign="top"><b>Attribute</b></td>
     <td valign="top"><b>Description</b></td>
-    <td align="center" valign="top"><b>Availability</b></td>
+    <td align="center" valign="top"><b>Availability on Java</b></td>
     <td align="center" valign="top"><b>Required</b></td>
   </tr>
   <tr>
@@ -532,11 +520,12 @@ to &lt;javadoc&gt; using <tt>classpath</
   <tr>
     <td valign="top">postProcessGeneratedJavadocs</td>
     <td valign="top">Whether to post-process the generated javadocs in
-    order to mitigate CVE-2013-1571.  Defaults to true.  <em>Since Ant
-    1.9.2</em><br></td>
-    There is a frame injection attack possible in javadocs generated by Oracle
-    JDKs prior to Java7 Update 25 (<a href="http://www.oracle.com/technetwork/java/javase/7u25-relnotes-1955741.html#jpi-upt" target="_blank">details</a>).  When this flag is set to true, Ant
-    will check whether the docs are vulnerable and will try to fix them.
+      order to mitigate CVE-2013-1571.  Defaults to true.  <em>Since Ant
+      1.9.2</em><br>
+      There is a frame injection attack possible in javadocs generated by Oracle
+      JDKs prior to Java7 Update 25 (<a href="http://www.oracle.com/technetwork/java/javase/7u25-relnotes-1955741.html#jpi-upt" target="_blank">details</a>).  
+      When this flag is set to true, Ant will check whether the docs are vulnerable 
+      and will try to fix them.
     </td>
     <td align="center" valign="top">1.4</td>
     <td align="center" valign="top">No</td>
@@ -920,62 +909,6 @@ arguments</a>. <em>Since Ant 1.6</em></p
   &lt/javadoc&gt;</pre>
 
 
-<a name="CVE-2013-1571-macrodef"><h3>workaround for CVE-2013-1571</h3></a>
-
-<p>The following macro can be used to post-process generated javadocs.</p>
-
-<pre>
-&lt;macrodef name="patch-javadoc">
-    &lt;attribute name="dir"/>
-    &lt;attribute name="docencoding" default="${file.encoding}"/>
-    &lt;sequential>
-      &lt;replace encoding="@{docencoding}" summary="true" taskname="patch-javadoc">
-        &lt;fileset dir="@{dir}" casesensitive="false" includes="**/index.html,**/index.htm,**/toc.html,**/toc.htm">
-          &lt;!-- TODO: add encoding="@{docencoding}" to contains check, when we are on ANT 1.9.0: -->
-          &lt;not>&lt;contains text="function validURL(url) {" casesensitive="true" />&lt;/not>
-        &lt;/fileset>
-        &lt;replacetoken>&lt;![CDATA[function loadFrames() {]]>&lt;/replacetoken>
-        &lt;replacevalue expandProperties="false">&lt;![CDATA[if (targetPage != "" && !validURL(targetPage))
-        targetPage = "undefined";
-    function validURL(url) {
-        var pos = url.indexOf(".html");
-        if (pos == -1 || pos != url.length - 5)
-            return false;
-        var allowNumber = false;
-        var allowSep = false;
-        var seenDot = false;
-        for (var i = 0; i &lt; url.length - 5; i++) {
-            var ch = url.charAt(i);
-            if ('a' &lt;= ch && ch &lt;= 'z' ||
-                    'A' &lt;= ch && ch &lt;= 'Z' ||
-                    ch == '$' ||
-                    ch == '_') {
-                allowNumber = true;
-                allowSep = true;
-            } else if ('0' &lt;= ch && ch &lt;= '9'
-                    || ch == '-') {
-                if (!allowNumber)
-                     return false;
-            } else if (ch == '/' || ch == '.') {
-                if (!allowSep)
-                    return false;
-                allowNumber = false;
-                allowSep = false;
-                if (ch == '.')
-                     seenDot = true;
-                if (ch == '/' && seenDot)
-                     return false;
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-    function loadFrames() {]]>&lt;/replacevalue>
-      &lt;/replace>
-    &lt;/sequential>
-  &lt;/macrodef>
-</pre>
 
 </body>
 </html>

Modified: ant/site/ant/production/manual/Tasks/junit.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/junit.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/junit.html (original)
+++ ant/site/ant/production/manual/Tasks/junit.html Thu Jun  4 04:01:24 2015
@@ -657,7 +657,7 @@ supported.</p>
 <ul>
   <li>It runs in the same Java VM as Ant itself, this is a different
     Java VM than the one that was executing the test and it may see a
-    different classloader (and thus may be unable to load the tast
+    different classloader (and thus may be unable to load the test
     class).</li>
   <li>It cannot determine which test was run when the timeout/crash
     occurred if the forked VM was running multiple test.  I.e. the

Modified: ant/site/ant/production/manual/Tasks/junitreport.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/junitreport.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/junitreport.html (original)
+++ ant/site/ant/production/manual/Tasks/junitreport.html Thu Jun  4 04:01:24 2015
@@ -167,6 +167,15 @@ These tags can pass XSL parameters to th
   </tr>
 </table>
 
+<h4>classpath</h4>
+<p><em>Since Ant 1.9.5.</em>
+Like for the <a href="../CoreTasks/style.html#classpath">XSLT task</a>,
+a nested &lt;classpath&gt; will be used to load the processor.</p>
+
+<h4>factory</h4>
+<p><em>Since Ant 1.9.5.</em>
+Like for the <a href="../CoreTasks/style.html#factory">XSLT task</a>,
+a nested &lt;factory&gt; can be used to specify factory settings.</p>
 
 
 <h3>Example of report</h3>

Modified: ant/site/ant/production/manual/Tasks/mail.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/mail.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/mail.html (original)
+++ ant/site/ant/production/manual/Tasks/mail.html Thu Jun  4 04:01:24 2015
@@ -162,7 +162,7 @@
     <td valign="top">ssl</td>
     <td valign="top">"true", "on" or "yes" accepted here<br></br>
     indicates whether you need TLS/SSL</td>
-    <td valign="center">No</td>
+    <td align="center" valign="top">No</td>
   </tr>
   <tr>
     <td valign="top">encoding</td>
@@ -197,7 +197,7 @@
       whether the STARTTLS command used to switch to an encrypted
       connection for authentication should be supported.  Requires
       JavaMail.  <em>Since Ant 1.8.0</em></td>
-    <td valign="center">No</td>
+    <td align="center" valign="top">No</td>
   </tr>
 </table>
 

Modified: ant/site/ant/production/manual/Tasks/property.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/property.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/property.html (original)
+++ ant/site/ant/production/manual/Tasks/property.html Thu Jun  4 04:01:24 2015
@@ -296,7 +296,7 @@ deploy.url=http://${deploy.server}:${dep
   variables. So it starts a command in a new process which prints the environment variables,
   analyzes the output and creates the properties. <br>
   There are commands for the following operating systems implemented in
-  <a href="http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Execute.java?view=markup">
+  <a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=blob;f=src/main/org/apache/tools/ant/taskdefs/Execute.java;hb=24e5a0e881dba01a6f012c4a271b743946412a0d">
   Execute.java</a> (method <tt>getProcEnvCommand()</tt>):
   <table>
     <tr>

Modified: ant/site/ant/production/manual/Tasks/propertyfile.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/propertyfile.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/propertyfile.html (original)
+++ ant/site/ant/production/manual/Tasks/propertyfile.html Thu Jun  4 04:01:24 2015
@@ -228,5 +228,22 @@ Concatenation of strings :</p>
 <p>Each time called, a &quot;.&quot; will be appended to &quot;progress&quot;
 </p>
 
+<p>Pumps the project version to the next minor version (increase minor and set path=0):
+<blockquote><pre>&lt;target name="nextMinorVersion"&gt;
+   &lt;property
+     name="header"
+     value="##Generated file - do not modify!"/&gt;
+   &lt;propertyfile file="version.properties" comment="${header}"&gt;
+     &lt;entry key="product.build.major"   type="int"  value="3" /&gt;
+     &lt;entry key="product.build.minor"   type="int"  operation="+" /&gt;
+     &lt;entry key="product.build.patch"   type="int"  value="0" /&gt;
+     &lt;entry key="product.build.date"    type="date" value="now" /&gt;
+  &lt;/propertyfile&gt;
+&lt;/target&gt;
+</pre></blockquote>
+After running this target the version changed e.g. from 3.2.2 to 3.3.0.
+</p>
+
+
 </body>
 </html>

Modified: ant/site/ant/production/manual/Tasks/scp.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/scp.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/scp.html (original)
+++ ant/site/ant/production/manual/Tasks/scp.html Thu Jun  4 04:01:24 2015
@@ -182,6 +182,24 @@ for more information.  This task has bee
     1.8.0</em></td>
     <td valign="top" align="center">No; defaults to false.</td>
   </tr>
+  <tr>
+    <td valign="top">filemode</td>
+    <td valign="top">A 3 digit octal string, specify the user, group
+      and other modes in the standard Unix fashion.  Only applies to
+      uploaded files.  Note the actual permissions of the remote
+      file will be governed by this setting and the UMASK on the
+      remote server. Default is 644. <em>since Ant 1.9.5</em>.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
+  <tr>
+    <td valign="top">dirmode</td>
+    <td valign="top">A 3 digit octal string, specify the user, group
+      and other modes in the standard Unix fashion.  Only applies to
+      uploaded dirs.  Note the actual permissions of the remote
+      dir will be governed by this setting and the UMASK on the
+      remote server. Default is 755. <em>since Ant 1.9.5</em>.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 <h3>Parameters specified as nested elements</h3>
 
@@ -261,7 +279,7 @@ system (via the ps command). The best ap
 <p>
 
 <p><strong>Unix Note:</strong> File permissions are not retained when files
-are copied; they end up with the default <code>UMASK</code> permissions
+are downloaded; they end up with the default <code>UMASK</code> permissions
 instead. This is caused by the lack of any means to query or set file
 permissions in the current Java runtimes. If you need a permission-
 preserving copy function, use <code>&lt;exec executable="scp" ... &gt;</code>

Modified: ant/site/ant/production/manual/Tasks/signjar.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/signjar.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/signjar.html (original)
+++ ant/site/ant/production/manual/Tasks/signjar.html Thu Jun  4 04:01:24 2015
@@ -27,7 +27,7 @@
 <h2><a name="signjar">SignJar</a></h2>
 <h3>Description</h3>
 <p>Signing a jar allows users to authenticate the publisher.</p>
-<p>Signs JAR files with the <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/jarsigner.html"><tt>jarsigner</tt> command line tool</a>. 
+<p>Signs JAR files with the <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/jarsigner.html"><tt>jarsigner</tt> command line tool</a>.
 It will take a named file in the <tt>jar</tt> attribute, and an optional
 <tt>destDir</tt> or <tt>signedJar</tt> attribute. Nested paths are also
 supported; here only an (optional) <tt>destDir</tt> is allowed. If a destination
@@ -40,10 +40,10 @@ Dependency rules
 <li>Nonexistent destination JARs are created/signed</li>
 <li>Out of date destination JARs are created/signed</li>
 <li>If a destination file and a source file are the same,
-and <tt>lazy</tt> is true, the JAR is only signed if it does not 
+and <tt>lazy</tt> is true, the JAR is only signed if it does not
 contain a signature by this alias.</li>
 <li>If a destination file and a source file are the same,
-and <tt>lazy</tt> is false, the JAR is signed.</li> 
+and <tt>lazy</tt> is false, the JAR is signed.</li>
 </ul>
 
 <h3>Parameters</h3>
@@ -91,7 +91,7 @@ and <tt>lazy</tt> is false, the JAR is s
   </tr>
   <tr>
     <td valign="top">signedjar</td>
-    <td valign="top">name of signed JAR file. This can only be set when 
+    <td valign="top">name of signed JAR file. This can only be set when
     the <tt>jar</tt> attribute is set.</td>
     <td valign="top" align="center">No.</td>
   </tr>
@@ -143,11 +143,21 @@ block</td>
   </tr>
   <tr>
     <td valign="top">tsacert</td>
-    <td valign="top">alias in the keystore for a timestamp authority for 
+    <td valign="top">alias in the keystore for a timestamp authority for
     timestamped JAR files in Java1.5+</td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>
+    <td valign="top">tsaproxyhost</td>
+    <td valign="top">proxy host to be used when connecting to TSA server</td>
+    <td valign="top" align="center">No</td>
+  </tr>
+  <tr>
+    <td valign="top">getTsaproxyport</td>
+    <td valign="top">proxy port to be used when connecting to TSA server</td>
+    <td valign="top" align="center">No</td>
+  </tr>
+  <tr>
     <td valign="top">executable</td>
     <td valign="top">Specify a particular <code>jarsigner</code> executable
       to use in place of the default binary (found in the same JDK as
@@ -156,14 +166,14 @@ block</td>
       jarsigner command.
       <em>since Ant 1.8.0</em>.</td>
     <td align="center" valign="top">No</td>
-  </tr>  
+  </tr>
   <tr>
     <td valign="top">force</td>
     <td valign="top">Whether to force signing of the jar file even if
       it doesn't seem to be out of date or already signed.
       <em>since Ant 1.8.0</em>.</td>
     <td align="center" valign="top">No; default false</td>
-  </tr>  
+  </tr>
   <tr>
     <td valign="top">sigalg</td>
     <td valign="top">name of signature algorithm</td>
@@ -273,7 +283,7 @@ With trusted timestamping, users can ver
 
 <p>
 Timestamped JAR files were introduced in Java1.5 and supported in Ant since
-Ant 1.7. Ant does not yet support proxy setup for this signing process. 
+Ant 1.7. Since Ant 1.9.5, Ant can use unauthenticated proxies for this signing process.
 </p>
 
 <p>Common public timestamp authorities include

Modified: ant/site/ant/production/manual/Tasks/style.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/style.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/style.html (original)
+++ ant/site/ant/production/manual/Tasks/style.html Thu Jun  4 04:01:24 2015
@@ -269,7 +269,7 @@ collection</a></h4>
 should be applied to.  Use a nested mapper and the task's destdir
 attribute to specify the output files.</p>
 
-<h4>classpath</h4>
+<h4><a name="classpath">classpath</a></h4>
 <p>The classpath to load the processor from can be specified via a
 nested <code>&lt;classpath&gt;</code>, as well - that is, a
 <a href="../using.html#path">path</a>-like structure.</p>
@@ -372,7 +372,7 @@ XSLT specifications</a>.
 </table>
 </blockquote>
 
-<h4>factory ('trax' processors only)</h4>
+<h4><a name="factory">factory ('trax' processors only)</a></h4>
 Used to specify factory settings.
 <blockquote>
 <h4>Parameters</h4>

Modified: ant/site/ant/production/manual/Tasks/tar.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/tar.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/tar.html (original)
+++ ant/site/ant/production/manual/Tasks/tar.html Thu Jun  4 04:01:24 2015
@@ -146,6 +146,15 @@ or "bzip2".</p>
        &quot;none&quot;.</td>
     <td valign="top" align="center">No</td>
   </tr>
+  <tr>
+    <td valign="top">encoding</td>
+    <td valign="top">The character encoding to use for filenames
+    inside the tar file.  For a list of possible values see the <a
+                href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.<br/>
+    Defaults to the platform's default character encoding.
+      <em>Since Ant 1.9.5</em>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>Nested Elements</h3>

Modified: ant/site/ant/production/manual/Tasks/unzip.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Tasks/unzip.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Tasks/unzip.html (original)
+++ ant/site/ant/production/manual/Tasks/unzip.html Thu Jun  4 04:01:24 2015
@@ -100,12 +100,13 @@ archive.</p>
   </tr>
   <tr>
     <td valign="top">encoding</td>
-    <td valign="top"><b>Note:</b> This attribute is not available for
-    the <code>untar</code> task.<br>
+    <td valign="top">
     The character encoding that has been used for filenames
     inside the zip file.  For a list of possible values see the <a
     href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.<br/>
-    Defaults to &quot;UTF8&quot;, use the magic value
+    Defaults to &quot;UTF8&quot; for the <code>unzip</code> and the
+    platform's default encoding for the <code>untar</code> task.  Use
+    the magic value
     <code>native-encoding</code> for the platform's default character
     encoding.
       <br/>See also the <a href="zip.html#encoding">discussion in the

Modified: ant/site/ant/production/manual/Types/dirset.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/dirset.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/dirset.html (original)
+++ ant/site/ant/production/manual/Types/dirset.html Thu Jun  4 04:01:24 2015
@@ -61,7 +61,10 @@ equivalent to an <code>&lt;and&gt;</code
   <tr>
     <td valign="top">includesfile</td>
     <td valign="top">The name of a file; each line of this file is
-      taken to be an include pattern.</td>
+      taken to be an include pattern.
+      <b>Note:</b> if the file is empty and there are no other
+      patterns defined for the fileset, all directories will be included.
+    </td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>

Modified: ant/site/ant/production/manual/Types/fileset.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/fileset.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/fileset.html (original)
+++ ant/site/ant/production/manual/Types/fileset.html Thu Jun  4 04:01:24 2015
@@ -71,7 +71,10 @@ equivalent to an <code>&lt;and&gt;</code
   <tr>
     <td valign="top">includesfile</td>
     <td valign="top">the name of a file; each line of this file is
-      taken to be an include pattern.</td>
+      taken to be an include pattern.<br/>
+      <b>Note:</b> if the file is empty and there are no other
+      patterns defined for the fileset, all files will be included.
+    </td>
     <td valign="top" align="center">No</td>
   </tr>
   <tr>

Modified: ant/site/ant/production/manual/Types/filterchain.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/filterchain.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/filterchain.html (original)
+++ ant/site/ant/production/manual/Types/filterchain.html Thu Jun  4 04:01:24 2015
@@ -551,14 +551,14 @@ user defined values.
   <tr>
     <td vAlign=top>tokenchar</td>
     <td vAlign=top>begintoken</td>
-    <td vAlign=top>Character marking the
+    <td vAlign=top>String marking the
     beginning of a token.  Defaults to @</td>
     <td vAlign=top align="center">No</td>
   </tr>
   <tr>
     <td vAlign=top>tokenchar</td>
     <td vAlign=top>endtoken</td>
-    <td vAlign=top>Character marking the
+    <td vAlign=top>String marking the
     end of a token.  Defaults to @</td>
     <td vAlign=top align="center">No</td>
   </tr>
@@ -623,6 +623,31 @@ Convenience method:
       &lt;token key=&quot;DATE&quot; value=&quot;${TODAY}&quot;/&gt;
     &lt;/replacetokens&gt;
   &lt;/filterchain&gt;
+&lt;/loadfile&gt;
+</pre></blockquote>
+
+This replaces occurrences of the string {{DATE}} in the data
+with today's date and stores it in the property ${src.file.replaced}.
+<blockquote><pre>
+&lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.replaced}&quot;&gt;
+  &lt;filterchain&gt;
+    &lt;filterreader classname=&quot;org.apache.tools.ant.filters.ReplaceTokens&quot;&gt;
+      &lt;param type=&quot;tokenchar&quot; name=&quot;begintoken&quot; value=&quot;{{&quot;/&gt;
+      &lt;param type=&quot;tokenchar&quot; name=&quot;endtoken&quot; value=&quot;}}&quot;/&gt;
+    &lt;/filterreader&gt;
+  &lt;/filterchain&gt;
+&lt;/loadfile&gt;
+</pre></blockquote>
+
+Convenience method:
+<blockquote><pre>
+&lt;tstamp/&gt;
+&lt;loadfile srcfile=&quot;${src.file}&quot; property=&quot;${src.file.replaced}&quot;&gt;
+  &lt;filterchain&gt;
+    &lt;replacetokens begintoken=&quot;{{&quot; endtoken=&quot;}}&quot;&gt;
+      &lt;token key=&quot;DATE&quot; value=&quot;${TODAY}&quot;/&gt;
+    &lt;/replacetokens&gt;
+  &lt;/filterchain&gt;
 &lt;/loadfile&gt;
 </pre></blockquote>
 

Modified: ant/site/ant/production/manual/Types/multirootfileset.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/multirootfileset.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/multirootfileset.html (original)
+++ ant/site/ant/production/manual/Types/multirootfileset.html Thu Jun  4 04:01:24 2015
@@ -19,7 +19,7 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="../stylesheets/style.css">
-<title>MultiRooFileSet Type</title>
+<title>MultiRootFileSet Type</title>
 </head>
 
 <body>
@@ -29,7 +29,7 @@
 <p><em>Since Ant 1.9.4</em></p>
 
 <p>A MultiRootFileSet is a group of files or directories. These files
-or drectories can be found in a directory forrest starting with a set
+or directories can be found in a directory forrest starting with a set
 of base directories and are matched by patterns taken from a number of
 <a href="patternset.html">PatternSets</a> and <a
 href="selectors.html">Selectors</a>.</p>

Modified: ant/site/ant/production/manual/Types/patternset.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/patternset.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/patternset.html (original)
+++ ant/site/ant/production/manual/Types/patternset.html Thu Jun  4 04:01:24 2015
@@ -50,7 +50,10 @@ or the following attributes.</p>
     <td valign="top">includesfile</td>
     <td valign="top">the name of a file; each line of this file is
       taken to be an include pattern. You can specify more than one
-      include file by using a nested includesfile elements.</td>
+      include file by using a nested includesfile elements.
+      <b>Note:</b> if the file is empty and there are no other
+      patterns defined for the fileset, all files will be included.
+    </td>
   </tr>
   <tr>
     <td valign="top">excludes</td>

Modified: ant/site/ant/production/manual/Types/propertyset.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/propertyset.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/propertyset.html (original)
+++ ant/site/ant/production/manual/Types/propertyset.html Thu Jun  4 04:01:24 2015
@@ -38,7 +38,7 @@ supports this.</p>
   </tr>
   <tr>
     <td valign="top">dynamic</td>
-    <td valign="top">Whether to reevaluate the set everytime the set
+    <td valign="top">Whether to reevaluate the set every time the set
       is used.  Default is &quot;<code>true</code>&quot;.</td>
     <td valign="top" align="center">No</td>
   </tr>

Modified: ant/site/ant/production/manual/Types/resources.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/resources.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/resources.html (original)
+++ ant/site/ant/production/manual/Types/resources.html Thu Jun  4 04:01:24 2015
@@ -359,6 +359,10 @@ Ant's "legacy" datatypes have been modif
     nested collection</li>
   <li><a href="#last">last</a> - last <i>n</i> resources from a
     nested collection</li>
+  <li><a href="#allbutfirst">allbutfirst</a> - all except the
+    first <i>n</i> resources from a nested collection</li>
+  <li><a href="#allbutlast">allbutlast</a> - all except the last <i>n</i>
+    resources from a nested collection</li>
   <li><a href="#tokens">tokens</a> - <a href="#string">string</a> tokens
     gathered from a nested collection</li>
   <li><a href="#union">union</a> - set union of nested resource collections</li>
@@ -499,8 +503,9 @@ platforms.
   <h4>Parameters specified as nested elements</h4>
   <p>A single resource collection is required.</p>
   <p>Nested resource selectors are used to "narrow down" the included
-    resources. These are patterned after <a href="selectors.html">file
-    selectors</a> but are, unsurprisingly, targeted to resources.
+    resources, combined via a logical <i>AND</i>. These are patterned 
+    after <a href="selectors.html">file selectors</a> but are, 
+    unsurprisingly, targeted to resources.
     Several built-in resource selectors are available in the internal
     <a href="antlib.html">antlib</a>
     <code>org.apache.tools.ant.types.resources.selectors</code>:
@@ -953,6 +958,64 @@ larger collection. <strong>Since Ant 1.7
       <td valign="top" align="center">No, default 1</td>
     </tr>
     <tr>
+      <td valign="top">cache</td>
+      <td valign="top">Whether to cache results; disabling
+        may seriously impact performance</td>
+      <td valign="top" align="center">No, default <i>true</i></td>
+    </tr>
+  </table>
+  <h4>Parameters specified as nested elements</h4>
+  <p>A single resource collection is required.</p>
+</blockquote>
+
+<h4><a name="allbutfirst">allbutfirst</a></h4>
+<p>Includes all elements except for the first <i>count</i> resources
+from a nested resource collection.  This can be used in conjunction
+with the <a href="#sort">sort</a> collection, for example, to select
+all but the first few oldest, largest, etc. resources from a larger
+collection. <strong>Since Ant 1.9.5</strong>.</p>
+<blockquote>
+  <table border="1" cellpadding="2" cellspacing="0">
+    <tr>
+      <td valign="top"><b>Attribute</b></td>
+      <td valign="top"><b>Description</b></td>
+      <td align="center" valign="top"><b>Required</b></td>
+    </tr>
+    <tr>
+      <td valign="top">count</td>
+      <td valign="top">The number of resources to exclude</td>
+      <td valign="top" align="center">No, default 1</td>
+    </tr>
+    <tr>
+      <td valign="top">cache</td>
+      <td valign="top">Whether to cache results; disabling
+        may seriously impact performance</td>
+      <td valign="top" align="center">No, default <i>true</i></td>
+    </tr>
+  </table>
+  <h4>Parameters specified as nested elements</h4>
+  <p>A single resource collection is required.</p>
+</blockquote>
+
+<h4><a name="allbutlast">allbutlast</a></h4>
+<p>Includes all elements except for the last <i>count</i> resources
+from a nested resource collection.  This can be used in conjunction
+with the <a href="#sort">sort</a> collection, for example, to select
+all but the last few oldest, largest, etc. resources from a larger
+collection. <strong>Since Ant 1.9.5</strong>.</p>
+<blockquote>
+  <table border="1" cellpadding="2" cellspacing="0">
+    <tr>
+      <td valign="top"><b>Attribute</b></td>
+      <td valign="top"><b>Description</b></td>
+      <td align="center" valign="top"><b>Required</b></td>
+    </tr>
+    <tr>
+      <td valign="top">count</td>
+      <td valign="top">The number of resources to exclude</td>
+      <td valign="top" align="center">No, default 1</td>
+    </tr>
+    <tr>
       <td valign="top">cache</td>
       <td valign="top">Whether to cache results; disabling
         may seriously impact performance</td>

Modified: ant/site/ant/production/manual/Types/selectors.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/selectors.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/selectors.html (original)
+++ ant/site/ant/production/manual/Types/selectors.html Thu Jun  4 04:01:24 2015
@@ -828,9 +828,9 @@
         <li> <b> seldirs </b>: same as attribute seldirs </li>
         <li> <b> algorithm.* </b>: Value is transferred to the algorithm via its
                                    <i>set</i>XX-methods </li>
-        <li> <b> cache.* </b>: Value is transfered to the cache via its
+        <li> <b> cache.* </b>: Value is transferred to the cache via its
                                    <i>set</i>XX-methods </li>
-        <li> <b> comparator.* </b>: Value is transfered to the comparator via its
+        <li> <b> comparator.* </b>: Value is transferred to the comparator via its
                                    <i>set</i>XX-methods </li>
     </ul>
 
@@ -1248,7 +1248,7 @@ Select files whose filename length is ev
 </pre></blockquote>
 
     <p>Selects all the JAR file larger than 4096 bytes which haven't been update
-      since the last millenium.
+      since the last millennium.
     </p>
 
 

Modified: ant/site/ant/production/manual/Types/tarfileset.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/tarfileset.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/tarfileset.html (original)
+++ ant/site/ant/production/manual/Types/tarfileset.html Thu Jun  4 04:01:24 2015
@@ -130,6 +130,15 @@ directories.  Default is 755.</td>
       </td>
       <td valign="top" align="center">No</td>
     </tr>
+    <tr>
+      <td valign="top">encoding</td>
+      <td valign="top">The character encoding to use for filenames
+      inside the zip file.  For a list of possible values see the <a
+      href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.
+      Defaults to the platform's default character encoding.
+        <em>Since Ant 1.9.5</em>
+      <td align="center" valign="top">No</td>
+    </tr>
   </tbody>
 </table>
 <p>The <i>fullpath</i> attribute can only be set for filesets that

Modified: ant/site/ant/production/manual/Types/zipfileset.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/Types/zipfileset.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/Types/zipfileset.html (original)
+++ ant/site/ant/production/manual/Types/zipfileset.html Thu Jun  4 04:01:24 2015
@@ -97,7 +97,6 @@ directories.  Default is 755. <em>since
       inside the zip file.  For a list of possible values see the <a
       href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html">Supported Encodings</a>.
       Defaults to the platform's default character encoding.
-      <b>Only supported by zipfileset.</b></td>
       <td align="center" valign="top">No</td>
     </tr>
     <tr>

Modified: ant/site/ant/production/manual/argumentprocessor.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/argumentprocessor.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/argumentprocessor.html (original)
+++ ant/site/ant/production/manual/argumentprocessor.html Thu Jun  4 04:01:24 2015
@@ -37,7 +37,7 @@ Ant behaviour.
 <p>
 An <code>ArgumentProcessor</code> is called each time Ant parse an unknown
 argument, an <code>ArgumentProcessor</code> doesn't take precedence over Ant to
-parse already suported options. It is then recommended to thrid party
+parse already suported options. It is then recommended to third party
 <code>ArgumentProcessor</code> implementation to chose specific 'enough'
 argument name, avoiding for instance one letter arguments.
 </p>
@@ -47,7 +47,7 @@ It is also called at the different phase
 implemented. It is called just after every arguments are parsed, just
 before the project is being configured (the build file being parsed),
 and just after. Some of the methods to be implemented return a boolean:
-if <code>true</code> is returned, Ant will terminate immediatly, without
+if <code>true</code> is returned, Ant will terminate immediately, without
 error.
 </p>
 

Modified: ant/site/ant/production/manual/cover.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/cover.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/cover.html (original)
+++ ant/site/ant/production/manual/cover.html Thu Jun  4 04:01:24 2015
@@ -19,14 +19,14 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.9.4 User Manual</title>
+<title>Apache Ant 1.9.5 User Manual</title>
 </head>
 
 <body bgcolor="#FFFFFF">
 <div align="center"> 
   <h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
-  <h1>Apache Ant&trade; 1.9.4 Manual</h1>
-  <p align="left">This is the manual for version 1.9.4 of
+  <h1>Apache Ant&trade; 1.9.5 Manual</h1>
+  <p align="left">This is the manual for version 1.9.5 of
   <a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>. 
     If your version 
     of Ant (as verified with <tt>ant -version</tt>) is older or newer than this 

Modified: ant/site/ant/production/manual/credits.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/credits.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/credits.html (original)
+++ ant/site/ant/production/manual/credits.html Thu Jun  4 04:01:24 2015
@@ -44,9 +44,9 @@
   <li>Bill Kelly (<a href="mailto:bill.kelly@softwired-inc.com">bill.kelly@softwired-inc.com</a>)</li>
   <li>Martijn Kruithof</li>
   <li>Arnout J. Kuiper (<a href="mailto:ajkuiper@wxs.nl">ajkuiper@wxs.nl</a>)</li>
-  <li>Antoine Lévy-Lambert</li>
+  <li>Antoine Lévy-Lambert</li>
   <li>Conor MacNeill</li>
-  <li>Jan Matèrne</li>
+  <li>Jan Matèrne</li>
   <li>Stefano Mazzocchi (<a href="mailto:stefano@apache.org">stefano@apache.org</a>)</li>
   <li>Erik Meade (<a href="mailto:emeade@geekfarm.org">emeade@geekfarm.org</a>)</li>
   <li>Sam Ruby (<a href="mailto:rubys@us.ibm.com">rubys@us.ibm.com</a>)</li>
@@ -62,7 +62,7 @@
 </ul>
 
 <center>
-<p>Version: 1.9.4</p>
+<p>Version: 1.9.5</p>
 </center>
 
 

Modified: ant/site/ant/production/manual/develop.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/develop.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/develop.html (original)
+++ ant/site/ant/production/manual/develop.html Thu Jun  4 04:01:24 2015
@@ -30,43 +30,43 @@
 <ol>
   <li>Create a Java class that extends <code>org.apache.tools.ant.Task</code>
       or <a href="base_task_classes.html">another class</a> that was designed to be extended.</li>
+
   <li>For each attribute, write a <i>setter</i> method. The setter method must be a
     <code>public void</code> method that takes a single argument. The
     name of the method must begin with <code>set</code>, followed by the
     attribute name, with the first character of the name in uppercase, and the rest in
-
     lowercase<a href="#footnote-1"><sup>*</sup></a>.  That is, to support an attribute named
     <code>file</code> you create a method <code>setFile</code>.
     Depending on the type of the argument, Ant will perform some
     conversions for you, see <a href="#set-magic">below</a>.</li>
 
   <li>If your task shall contain other tasks as nested elements (like
-  <a href="Tasks/parallel.html"><code>parallel</code></a>), your
-  class must implement the interface
-  <code>org.apache.tools.ant.TaskContainer</code>.  If you do so, your
-  task can not support any other nested elements.  See 
-  <a href="#taskcontainer">below</a>.</li>
-
-<li>If the task should support character data (text nested between the
-start end end tags), write a <code>public void addText(String)</code>
-method.  Note that Ant does <strong>not</strong> expand properties on
-the text it passes to the task.</li>
-
-<li>For each nested element, write a <i>create</i>, <i>add</i> or
-<i>addConfigured</i> method.  A create method must be a
-<code>public</code> method that takes no arguments and returns an
-<code>Object</code> type. The name of the create method must begin
-with <code>create</code>, followed by the element name. An add (or
-addConfigured) method must be a <code>public void</code> method that
-takes a single argument of an <code>Object</code> type with a
-no-argument constructor.  The name of the add (addConfigured) method
-must begin with <code>add</code> (<code>addConfigured</code>),
-followed by the element name.  For a more complete discussion see 
-<a href="#nested-elements">below</a>.</li>
-
-<li>Write a <code>public void execute</code> method, with no arguments, that
-throws a <code>BuildException</code>. This method implements the task
-itself.</li>
+    <a href="Tasks/parallel.html"><code>parallel</code></a>), your
+    class must implement the interface
+    <code>org.apache.tools.ant.TaskContainer</code>.  If you do so, your
+    task can not support any other nested elements.  See 
+    <a href="#taskcontainer">below</a>.</li>
+
+  <li>If the task should support character data (text nested between the
+    start end end tags), write a <code>public void addText(String)</code>
+    method.  Note that Ant does <strong>not</strong> expand properties on
+    the text it passes to the task.</li>
+
+  <li>For each nested element, write a <i>create</i>, <i>add</i> or
+    <i>addConfigured</i> method.  A create method must be a
+    <code>public</code> method that takes no arguments and returns an
+    <code>Object</code> type. The name of the create method must begin
+    with <code>create</code>, followed by the element name. An add (or
+    addConfigured) method must be a <code>public void</code> method that
+    takes a single argument of an <code>Object</code> type with a
+    no-argument constructor.  The name of the add (addConfigured) method
+    must begin with <code>add</code> (<code>addConfigured</code>),
+    followed by the element name.  For a more complete discussion see 
+    <a href="#nested-elements">below</a>.</li>
+
+  <li>Write a <code>public void execute</code> method, with no arguments, that
+    throws a <code>BuildException</code>. This method implements the task
+    itself.</li>
 </ol>
 
 <hr>
@@ -261,7 +261,7 @@ handled.</p>
 the methods will be called, but we don't know which, this depends on
 the implementation of your Java virtual machine.</p>
 
-  <h3><a name="nestedtype">Nested Types</a></h3>
+<h3><a name="nestedtype">Nested Types</a></h3>
 If your task needs to nest an arbitrary type that has been defined
   using <code>&lt;typedef&gt;</code> you have two options.
   <ol>
@@ -361,6 +361,7 @@ public class Sample {
 &lt;/copy&gt;
     </blockquote>
   </pre>
+
 <h3><a name="taskcontainer">TaskContainer</a></h3>
 
 <p>The <code>TaskContainer</code> consists of a single method,
@@ -382,8 +383,7 @@ invoke <code>perform</code> on these ins
 <h3>Example</h3>
 <p>Let's write our own task, which prints a message on the
 <code>System.out</code> stream.
-The
-task has one attribute, called <code>message</code>.</p>
+The task has one attribute, called <code>message</code>.</p>
 <blockquote>
 <pre>
 package com.mydomain;
@@ -430,6 +430,7 @@ public class MyVeryOwnTask extends Task
 &lt;/project&gt;
 </pre>
 </blockquote>
+
 <h3>Example 2</h3>
 To use a task directly from the buildfile which created it, place the
 <code>&lt;taskdef&gt;</code> declaration inside a target
@@ -467,42 +468,41 @@ package. Then you can use it as if it we
 
 <hr>
 <h2><a name="buildevents">Build Events</a></h2>
-<P>Ant is capable of generating build events as it performs the tasks necessary to build a project.
+<p>Ant is capable of generating build events as it performs the tasks necessary to build a project.
 Listeners can be attached to Ant to receive these events. This capability could be used, for example,
 to connect Ant to a GUI or to integrate Ant with an IDE.
-</P>
+</p>
 <p>To use build events you need to create an ant <code>Project</code> object. You can then call the
 <code>addBuildListener</code> method to add your listener to the project. Your listener must implement
 the <code>org.apache.tools.antBuildListener</code> interface. The listener will receive BuildEvents
-for the following events</P>
+for the following events</p>
 <ul>
-<li>Build started</li>
-<li>Build finished</li>
-<li>Target started</li>
-<li>Target finished</li>
-<li>Task started</li>
-<li>Task finished</li>
-<li>Message logged</li>
+  <li>Build started</li>
+  <li>Build finished</li>
+  <li>Target started</li>
+  <li>Target finished</li>
+  <li>Task started</li>
+  <li>Task finished</li>
+  <li>Message logged</li>
 </ul>
 
-<p>If the build file invokes another build file via <a
-href="Tasks/ant.html"><code>&lt;ant&gt;</code></a> or <a
-href="Tasks/subant.html"><code>&lt;subant&gt;</code></a> or uses <a
-href="Tasks/antcall.html"><code>&lt;antcall&gt;</code></a>, you are creating a
+<p>If the build file invokes another build file via 
+<a href="Tasks/ant.html"><code>&lt;ant&gt;</code></a> or 
+<a href="Tasks/subant.html"><code>&lt;subant&gt;</code></a> or uses 
+<a href="Tasks/antcall.html"><code>&lt;antcall&gt;</code></a>, you are creating a
 new Ant "project" that will send target and task level events of its
 own but never sends build started/finished events.  Ant 1.6.2
 introduces an extension of the BuildListener interface named
 SubBuildListener that will receive two new events for</p>
 <ul>
-<li>SubBuild started</li>
-<li>SubBuild finished</li>
+  <li>SubBuild started</li>
+  <li>SubBuild finished</li>
 </ul>
 <p>If you are interested in those events, all you need to do is to
 implement the new interface instead of BuildListener (and register the
 listener, of course).</p>
 
-<p>
-If you wish to attach a listener from the command line you may use the
+<p>If you wish to attach a listener from the command line you may use the
 <code>-listener</code> option. For example:</p>
 <blockquote>
   <pre>ant -listener org.apache.tools.ant.XmlLogger</pre>
@@ -515,8 +515,7 @@ these streams is redirected by Ant's cor
 streams can cause an infinite loop in Ant. Depending on the version of Ant, this will
 either cause the build to terminate or the Java VM to run out of Stack space. A logger, also, may 
 not access System.out and System.err directly. It must use the streams with which it has
-been configured.
-</p>
+been configured.</p>
 
 <p><b>Note2:</b> All methods of a BuildListener except for the "Build
   Started" and "Build Finished" events may occur on several threads
@@ -526,20 +525,19 @@ been configured.
 <hr>
 <h2><a name="integration">Source code integration</a></h2>
 
-The other way to extend Ant through Java is to make changes to existing tasks, which is positively encouraged.
+<p>The other way to extend Ant through Java is to make changes to existing tasks, which is positively encouraged.
 Both changes to the existing source and new tasks can be incorporated back into the Ant codebase, which
-benefits all users and spreads the maintenance load around.
-<p>
+benefits all users and spreads the maintenance load around.</p>
 
-Please consult the
-<a href="http://jakarta.apache.org/site/getinvolved.html">Getting Involved</a> pages on the Jakarta web site
+<p>Please consult the
+<a href="http://www.apache.org/foundation/getinvolved.html">Getting Involved</a> pages on the Apache web site
 for details on how to fetch the latest source and how to submit changes for reincorporation into the
-source tree.
-<p>
-Ant also has some
+source tree.</p>
+
+<p>Ant also has some
 <a href="http://ant.apache.org/ant_task_guidelines.html">task guidelines</a>
 which provides some advice to people developing and testing tasks. Even if you intend to
-keep your tasks to yourself, you should still read this as it should be informative.
+keep your tasks to yourself, you should still read this as it should be informative.</p>
 
 </body>
 </html>

Modified: ant/site/ant/production/manual/install.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/install.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/install.html (original)
+++ ant/site/ant/production/manual/install.html Thu Jun  4 04:01:24 2015
@@ -116,8 +116,8 @@ Ant release from
 <a href="http://ant.apache.org/srcdownload.cgi" target="_top">http://ant.apache.org/srcdownload.cgi</a>.
 
 If you prefer the leading-edge code, you can access
-the code as it is being developed via SVN. The Ant website has details on
-<a href="http://ant.apache.org/svn.html" target="_top">accessing SVN</a>.
+the code as it is being developed via git. The Ant website has details on
+<a href="http://ant.apache.org/git.html" target="_top">accessing git</a>.
 All bug fixes will go in against the HEAD of the source tree, and the first
 response to many bugreps will be "have you tried the latest version".
 Don't be afraid to download and build a prererelease edition, as everything
@@ -129,7 +129,7 @@ other than new features are usually stab
 See the section <a href="#buildingant">Building Ant</a> on how to
 build Ant from the source code.
 You can also access the
-<a href="http://svn.apache.org/viewcvs.cgi/ant/" target="_top">
+<a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=summary" target="_top">
 Ant SVN repository</a> on-line. </p>
 
 <h3 name="archives">Archive Download Area Layout</h3>
@@ -721,7 +721,7 @@ at the source for your platform's invoca
 <hr>
 <h2><a name="buildingant">Building Ant</a></h2>
 <p>To build Ant from source, you can either install the Ant source distribution
-or checkout the ant module from SVN. See <a href="#sourceEdition">Source Edition</a> for details.</p>
+or clone the ant repository from git. See <a href="#sourceEdition">Source Edition</a> for details.</p>
 <p>Once you have installed the source, change into the installation
 directory.</p>
 

Modified: ant/site/ant/production/manual/listeners.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/listeners.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/listeners.html (original)
+++ ant/site/ant/production/manual/listeners.html Thu Jun  4 04:01:24 2015
@@ -218,6 +218,26 @@ control for turning off success or failu
     <td width="63%">Yes, if success mail is to be sent</td>
   </tr>
   <tr>
+    <td width="337">MailLogger.failure.cc </td>
+    <td width="63%">Address(es) to send failure messages to carbon copy (cc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
+  <tr>
+    <td width="337">MailLogger.success.cc </td>
+    <td width="63%">Address(es) to send success messages to carbon copy (cc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
+  <tr>
+    <td width="337">MailLogger.failure.bcc </td>
+    <td width="63%">Address(es) to send failure messages to blind carbon copy (bcc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
+  <tr>
+    <td width="337">MailLogger.success.bcc </td>
+    <td width="63%">Address(es) to send success messages to blind carbon copy (bcc), comma-separated</td>
+    <td width="63%">No</td>
+  </tr>
+  <tr>
     <td width="337">MailLogger.failure.subject </td>
     <td width="63%">Subject of failed build</td>
     <td width="63%">No, default &quot;Build Failure&quot;</td>

Modified: ant/site/ant/production/manual/properties.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/properties.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/properties.html (original)
+++ ant/site/ant/production/manual/properties.html Thu Jun  4 04:01:24 2015
@@ -77,6 +77,9 @@ ant.project.invoked-targets
                     been specified on the command line (the IDE,
                     an &lt;ant&gt; task ...) when invoking the current
                     project.
+                    This property is set when the first target is executed.
+                    So you can't use it in the implicit target (directly
+                    under the &lt;project&gt; tag).
 ant.java.version    the JVM version Ant detected; currently it can hold
                     the values &quot;1.7&quot;, &quot;1.6&quot;, &quot;1.5&quot;,
                     &quot;1.4&quot;,  &quot;1.3&quot; and &quot;1.2&quot;.
@@ -125,7 +128,7 @@ ant.library.dir     the directory that h
       <p>This is the interface you'd implement if you wanted to invent
         your own property syntax - or allow nested property expansions
         since the default implementation doesn't balance braces
-        (see <a href="http://svn.apache.org/viewvc/ant/antlibs/props/trunk/src/main/org/apache/ant/props/NestedPropertyExpander.java?view=log"><code>NestedPropertyExpander</code>
+        (see <a href="https://git-wip-us.apache.org/repos/asf?p=ant-antlibs-props.git;a=blob;f=src/main/org/apache/ant/props/NestedPropertyExpander.java;hb=HEAD"><code>NestedPropertyExpander</code>
         in the "props" Antlib</a> for an example).</p>
     </li>
 

Modified: ant/site/ant/production/manual/running.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/running.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/running.html (original)
+++ ant/site/ant/production/manual/running.html Thu Jun  4 04:01:24 2015
@@ -100,11 +100,11 @@ targets, or if Ant is invoked in -verbos
 <h3><a name="options">Command-line Options Summary</a></h3>
 <pre>ant [options] [target [target2 [target3] ...]]
 Options:
-  -help, -h              print this message
-  -projecthelp, -p       print project help information
+  -help, -h              print this message and exit
+  -projecthelp, -p       print project help information and exit
   -version               print the version information and exit
   -diagnostics           print information that might be helpful to
-                         diagnose or report problems.
+                         diagnose or report problems and exit
   -quiet, -q             be extra quiet
   -silent, -S            print nothing but task outputs and build failures
   -verbose, -v           be extra verbose

Modified: ant/site/ant/production/manual/tutorial-tasks-filesets-properties.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/tutorial-tasks-filesets-properties.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/tutorial-tasks-filesets-properties.html (original)
+++ ant/site/ant/production/manual/tutorial-tasks-filesets-properties.html Thu Jun  4 04:01:24 2015
@@ -385,13 +385,13 @@ too.</p>
         &lt;/path&gt;
     &lt;/find&gt;
 </pre>
-<p>On <b>*1</b> we rename only the vector. It�s just for better reading the source. On <b>*2</b>
+<p>On <b>*1</b> we rename only the vector. It�s just for better reading the source. On <b>*2</b>
 we have to provide the right method: an add<i>Name</i>(<i>Type</i> t). Therefore replace the
 fileset with path here. Finally we have to modify our buildfile on <b>*3</b> because our task
-doesn�t support nested filesets any longer. So we wrap the fileset inside a path.</p>
+doesn�t support nested filesets any longer. So we wrap the fileset inside a path.</p>
 
 <p>And now we modify the testcase. Oh, not very much to do :-) Renaming the <tt>testMissingFileset()</tt>
-(not really a <i>must-be</i> but better it�s named like the think it does) and update the
+(not really a <i>must-be</i> but better it�s named like the think it does) and update the
 <i>expected</i>-String in that method (now a <tt>path not set</tt> message is expected). The more complex
 test cases base on the buildscript. So the targets <tt>testFileNotPresent</tt> and <tt>testFilePresent</tt> have to be
 modified in the manner described above.</p>
@@ -761,7 +761,7 @@ cvs -d :pserver:anoncvs@cvs.apache.org:/
 </pre></p>
 
 <p>We use the <i>-d</i> flag on <b>//1</b> to specify the cvs directory. You can
-specify the environment variable CVSROOT with that value and after that you haven�t
+specify the environment variable CVSROOT with that value and after that you haven�t
 to use that flag any more. On <b>//2</b> we get the whole cvs tree of ant. (Sorry,
 but that uses a lot of time ... 10 up to 30 minutes are not unusual ... but this has
 to be done only once :-). A cvs update doesn't use a modulename but you have to be

Modified: ant/site/ant/production/manual/using.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manual/using.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manual/using.html (original)
+++ ant/site/ant/production/manual/using.html Thu Jun  4 04:01:24 2015
@@ -166,13 +166,13 @@ task instances at all, only proxies.
 <h3><a name="example">Example Buildfile</a></h3>
 <pre>
 &lt;project name=&quot;MyProject&quot; default=&quot;dist&quot; basedir=&quot;.&quot;&gt;
-    &lt;description&gt;
-        simple example build file
-    &lt;/description&gt;
+  &lt;description&gt;
+    simple example build file
+  &lt;/description&gt;
   &lt;!-- set global properties for this build --&gt;
   &lt;property name=&quot;src&quot; location=&quot;src&quot;/&gt;
   &lt;property name=&quot;build&quot; location=&quot;build&quot;/&gt;
-  &lt;property name=&quot;dist&quot;  location=&quot;dist&quot;/&gt;
+  &lt;property name=&quot;dist&quot; location=&quot;dist&quot;/&gt;
 
   &lt;target name=&quot;init&quot;&gt;
     &lt;!-- Create the time stamp --&gt;
@@ -182,13 +182,13 @@ task instances at all, only proxies.
   &lt;/target&gt;
 
   &lt;target name=&quot;compile&quot; depends=&quot;init&quot;
-        description=&quot;compile the source &quot; &gt;
+        description=&quot;compile the source&quot;&gt;
     &lt;!-- Compile the java code from ${src} into ${build} --&gt;
     &lt;javac srcdir=&quot;${src}&quot; destdir=&quot;${build}&quot;/&gt;
   &lt;/target&gt;
 
   &lt;target name=&quot;dist&quot; depends=&quot;compile&quot;
-        description=&quot;generate the distribution&quot; &gt;
+        description=&quot;generate the distribution&quot;&gt;
     &lt;!-- Create the distribution directory --&gt;
     &lt;mkdir dir=&quot;${dist}/lib&quot;/&gt;
 
@@ -197,7 +197,7 @@ task instances at all, only proxies.
   &lt;/target&gt;
 
   &lt;target name=&quot;clean&quot;
-        description=&quot;clean up&quot; &gt;
+        description=&quot;clean up&quot;&gt;
     &lt;!-- Delete the ${build} and ${dist} directory trees --&gt;
     &lt;delete dir=&quot;${build}&quot;/&gt;
     &lt;delete dir=&quot;${dist}&quot;/&gt;

Modified: ant/site/ant/production/manualdownload.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/manualdownload.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/manualdownload.html (original)
+++ ant/site/ant/production/manualdownload.html Thu Jun  4 04:01:24 2015
@@ -253,11 +253,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Ant"></a>
       Current Release of Ant
     </h3>
-                        <p>Currently, Apache Ant 1.9.4 is the best available version, see the
+                        <p>Currently, Apache Ant 1.9.5 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.4 was released on 05-May-2014 and
+<div class="content">Ant 1.9.5 was released on 03-Jun-2015 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -268,25 +268,25 @@ may not be available on all mirrors for
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.4-manual.zip">apache-ant-1.9.4-manual.zip</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.5-manual.zip">apache-ant-1.9.5-manual.zip</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.4-manual.tar.gz">apache-ant-1.9.4-manual.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.5-manual.tar.gz">apache-ant-1.9.5-manual.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/manual/apache-ant-1.9.4-manual.tar.bz2">apache-ant-1.9.4-manual.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.4-manual.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/manual/apache-ant-1.9.5-manual.tar.bz2">apache-ant-1.9.5-manual.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/manual/apache-ant-1.9.5-manual.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
@@ -309,17 +309,17 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.4-manual.tar.gz.asc<br />
+% pgpv apache-ant-1.9.5-manual.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.4-manual.tar.gz.asc<br />
+% pgp apache-ant-1.9.5-manual.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.4-manual.tar.gz.asc
+% gpg --verify apache-ant-1.9.5-manual.tar.gz.asc
 </code></p>
                                 <p>A command line version of <a href="http://www.gnupg.org/download/">GnuPG</a> 
 is also available for Windows users.  Follow the 

Modified: ant/site/ant/production/srcdownload.html
URL: http://svn.apache.org/viewvc/ant/site/ant/production/srcdownload.html?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/production/srcdownload.html (original)
+++ ant/site/ant/production/srcdownload.html Thu Jun  4 04:01:24 2015
@@ -257,11 +257,11 @@ Other mirrors: <select name="Preferred">
       <a name="Current Release of Apache Ant"></a>
       Current Release of Apache Ant
     </h3>
-                        <p>Currently, Apache Ant 1.9.4 is the best available version, see the
+                        <p>Currently, Apache Ant 1.9.5 is the best available version, see the
 <a href="[preferred]/ant/README.html">release notes</a>.</p>
                                 <div class="warning">
 <div class="label">Note</div>
-<div class="content">Ant 1.9.4 was released on 05-May-2014 and
+<div class="content">Ant 1.9.5 was released on 03-Jun-2015 and
 may not be available on all mirrors for a few days.</div>
 </div>
                                 <br />
@@ -272,25 +272,25 @@ may not be available on all mirrors for
 </div>
                                 <ul>
 <li><code>.zip</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.4-src.zip">apache-ant-1.9.4-src.zip</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.zip.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.zip.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.zip.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.zip.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.5-src.zip">apache-ant-1.9.5-src.zip</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.zip.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.zip.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.zip.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.zip.md5">MD5</a>]</li>
 
 <li><code>.tar.gz</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.4-src.tar.gz">apache-ant-1.9.4-src.tar.gz</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.gz.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.gz.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.gz.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.gz.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.5-src.tar.gz">apache-ant-1.9.5-src.tar.gz</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.gz.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.gz.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.gz.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.gz.md5">MD5</a>]</li>
 
 <li><code>.tar.bz2</code> archive:
-<a href="[preferred]/ant/source/apache-ant-1.9.4-src.tar.bz2">apache-ant-1.9.4-src.tar.bz2</a>
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.bz2.asc">PGP</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.bz2.sha1">SHA1</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.bz2.sha512">SHA512</a>]
-[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.4-src.tar.bz2.md5">MD5</a>]</li>
+<a href="[preferred]/ant/source/apache-ant-1.9.5-src.tar.bz2">apache-ant-1.9.5-src.tar.bz2</a>
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.bz2.asc">PGP</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.bz2.sha1">SHA1</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.bz2.sha512">SHA512</a>]
+[<a href="https://www.apache.org/dist/ant/source/apache-ant-1.9.5-src.tar.bz2.md5">MD5</a>]</li>
 </ul>
                         <h3 class="section">
       <a name="Old Ant Releases"></a>
@@ -313,17 +313,17 @@ directory</a>, rather than from a mirror
 using</p>
                                 <p><code>
 % pgpk -a KEYS<br />
-% pgpv apache-ant-1.9.4-src.tar.gz.asc<br />
+% pgpv apache-ant-1.9.5-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % pgp -ka KEYS<br />
-% pgp apache-ant-1.9.4-src.tar.gz.asc<br />
+% pgp apache-ant-1.9.5-src.tar.gz.asc<br />
 </code>
 <em>or</em><br />
 <code>
 % gpg --import KEYS<br />
-% gpg --verify apache-ant-1.9.4-src.tar.gz.asc
+% gpg --verify apache-ant-1.9.5-src.tar.gz.asc
 </code></p>
                                 <p>Alternatively, you can verify the checksums on the files.  Unix
 programs called <code>md5</code>/<code>sha1</code>/<code>sha512</code> or

Modified: ant/site/ant/sources/antnews.xml
URL: http://svn.apache.org/viewvc/ant/site/ant/sources/antnews.xml?rev=1683458&r1=1683457&r2=1683458&view=diff
==============================================================================
--- ant/site/ant/sources/antnews.xml (original)
+++ ant/site/ant/sources/antnews.xml Thu Jun  4 04:01:24 2015
@@ -26,6 +26,16 @@
   </properties>
 
 <body>
+  <section name="Apache Ant 1.9.5">
+    <h3>Jun 3, 2015 - Apache Ant 1.9.5 Released</h3>
+    <p>Apache Ant 1.9.5 is now available for download as source or
+      binary from
+      <a href="http://ant.apache.org/bindownload.cgi">http://ant.apache.org/bindownload.cgi</a>.</p>
+
+    <p>Ant 1.9.5 contains several bug fixes and improvements compared to Ant 1.9.4,
+      most importantly bug in the &lt;tar&gt; family of tasks and types.</p>
+
+  </section>
     <section name="Migration to Git">
       <h3>May 23d, 2014 - Apache Ant's family of projects migrates to git on https://git-wip-us.apache.org/repos/asf</h3>
       <p>The Apache Ant family of projects migrates to git hosted by the Apache Software Foundation's infrastructure on



Mime
View raw message