[ant] 02/02: Merge 1.9.x branch into master

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jaikiran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git

commit 9eb170b4c2d8cab003ad1ba6d6a9fc7873a4e9ac
Merge: fe1ed77 f04cc8b
Author: Jaikiran Pai <ja...@apache.org>
AuthorDate: Tue Feb 26 08:54:38 2019 +0530

    Merge 1.9.x branch into master

 manual/Tasks/conditions.html                                      | 1 +
 src/main/org/apache/tools/ant/taskdefs/condition/IsReachable.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --cc manual/Tasks/conditions.html
index 97264f1,2af7b30..cc41d17
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@@ -569,43 -632,58 +569,44 @@@ specifications, by attempting to set th
  <pre>
  &lt;parsersupports
    property="http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation"
 -  value="document.xsd"/&gt;
 -</pre>
 +  value="document.xsd"/&gt;</pre>
 +<p>Check for Xerces-specific definition of the location of the no namespace schema.</p>
  
 -Check for Xerces-specific definition of the location of the no namespace schema.
 +<h4 id="isreachable">isreachable</h4>
  
 -<h4><a name="isreachable">isreachable</a></h4>
 +<p>Uses Java 5+ networking APIs to probe for a (remote) system being reachable. Exactly what probe
 +mechanisms are used is an implementation feature of the JVM. They may include ICMP "ping" packets,
 +UDP or TCP connections to port 7 "echo service" or other means.</p>
 +<p>This condition turns unknown host exceptions into false conditions. This is because on a laptop,
 +DNS is one of the first services when the network goes; you are implicitly offline.</p>
 +<p>If a URL is supplied instead of a <var>host</var>, the hostname is extracted and used in the
 +test&mdash;all other parts of the URL are discarded.</p>
 +<p>The test may not work through firewalls, that is, something may be reachable using a protocol
 +such as HTTP, while the lower level ICMP packets get dropped on the floor. Similarly, a host may
 +detected as reachable with ICMP, but not reachable on other ports (i.e. port 80), because of
 +firewalls.</p>
 +<p><em>Since Apache Ant 1.7</em>.</p>
  
 -<p>Uses Java1.5+ networking APIs to probe for a (remote) system being
 -reachable. Exactly what probe mechanisms are used is an implementation
 -feature of the JVM. They may include ICMP "ping" packets, UDP or TCP connections
 -to port 7 "echo service" or other means.
 +<table class="attr">
+ 
 -</p>
 -<p>
 -This condition turns unknown host exceptions into false conditions. This is
 -because on a laptop, DNS is one of the first services when the network goes; you
 -are implicitly offline.
 -</p>
 -<p>
 - If a URL is supplied instead of a host, the hostname is extracted
 - and used in the test - all other parts of the URL are discarded.
 -</p>
 -<p>
 -The test may not work through firewalls, that is, something may be reachable
 -using a protocol such as HTTP, while the lower level ICMP packets get dropped
 -on the floor. Similarly, a host may detected as reachable with ICMP, but
 -not reachable on other ports (i.e. port 80), because of firewalls.
 -</p>
 -<p>
 -
 -This condition was added in Apache Ant 1.7.</p>
 -
 -<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>
 +    <th scope="col">Attribute</th>
 +    <th scope="col">Description</th>
 +    <th scope="col">Required</th>
    </tr>
    <tr>
 -    <td valign="top">host</td>
 -    <td valign="top">host to check for</td>
 -    <td valign="top" align="center">one of url or host</td>
 +    <td>host</td>
 +    <td>host to check for</td>
 +    <td rowspan="2">Exactly one of the two</td>
    </tr>
    <tr>
 -    <td valign="top">url</td>
 -    <td valign="top">URL containing hostname</td>
 -    <td valign="top" align="center">one of url or host</td>
 +    <td>url</td>
 +    <td class="left">URL containing hostname</td>
    </tr>
    <tr>
 -    <td valign="top">timeout</td>
 -    <td valign="top">timeout in seconds</td>
 -    <td valign="top" align="center">no, default is 30s</td>
 +    <td>timeout</td>
 +    <td>timeout in seconds</td>
 +    <td>No; default is <q>30</q></td>
    </tr>
  </table>