You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/02/28 07:01:40 UTC
[25/47] ant git commit: Use HTML 5(-ish), fix links
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/serverdeploy.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/serverdeploy.html b/manual/Tasks/serverdeploy.html
index bfe738e..ec90ce1 100644
--- a/manual/Tasks/serverdeploy.html
+++ b/manual/Tasks/serverdeploy.html
@@ -29,99 +29,94 @@
<p>by</p>
<!-- Names are in alphabetical order, on last name -->
<ul>
-<li>Christopher A. Longo (<a href="mailto:cal@cloud9.net">cal@cloud9.net</a>)</li>
-<li>Cyrille Morvan (<a href="mailto:cmorvan@ingenosya.com">cmorvan@ingenosya.com</a>)</li>
+ <li>Christopher A. Longo (<a href="mailto:cal@cloud9.net">cal@cloud9.net</a>)</li>
+ <li>Cyrille Morvan (<a href="mailto:cmorvan@ingenosya.com">cmorvan@ingenosya.com</a>)</li>
</ul>
<hr/>
<p>At present the tasks support:</p>
<ul>
-<li><a href="http://www.bea.com" target="_top">Weblogic</a> servers</li>
-<li><a href="http://www.objectweb.org/jonas/" target="_top">JOnAS</a>
-2.4 Open Source EJB server</li>
+ <li><a href="http://www.bea.com" target="_top">WebLogic</a> servers</li>
+ <li><a href="https://jonas.ow2.org/" target="_top">JOnAS</a> 2.4 Open Source EJB server</li>
</ul>
-<p>
-Over time we expect further optional tasks to support additional J2EE Servers.
-</p>
+<p>Over time we expect further optional tasks to support additional J2EE Servers.</p>
<hr/>
<table>
-<tr><td>Task</td><td colspan="2">Application Servers</td></tr>
-<tr><td rowspan="4"><a href="#serverdeploy_element">serverdeploy</a></td><td colspan="2" align="center"><b>Nested Elements</b></td></tr>
-<tr><td><a href="#serverdeploy_generic">generic</a></td><td>Generic task</td></tr>
-<tr><td><a href="#serverdeploy_jonas">jonas</a></td><td>JOnAS 2.4</td></tr>
-<tr><td><a href="#serverdeploy_weblogic">weblogic</a></td><td>Weblogic</td></tr>
-
+ <tr><th>Task</th><th colspan="2">Application Servers</th></tr>
+ <tr><td rowspan="4"><a href="#serverdeploy_element">serverdeploy</a></td><th colspan="2">Nested Elements</th></tr>
+ <tr><td><a href="#serverdeploy_generic">generic</a></td><td>Generic task</td></tr>
+ <tr><td><a href="#serverdeploy_jonas">jonas</a></td><td>JOnAS 2.4</td></tr>
+ <tr><td><a href="#serverdeploy_weblogic">weblogic</a></td><td>WebLogic</td></tr>
</table>
<h2 id="serverdeploy_element">ServerDeploy element</h2>
-<h3><b>Description:</b></h3>
+<h3>Description</h3>
-<p>The <code>serverdeploy</code> task is used to run a "hot" deployment tool for
-vendor-specific J2EE server. The task requires nested elements which define
-the attributes of the vendor-specific deployment tool being executed.
-Vendor-specific deployment tools elements may enforce rules for which
-attributes are required, depending on the tool.
-</p>
+<p>The <code>serverdeploy</code> task is used to run a "hot" deployment tool for vendor-specific
+J2EE server. The task requires nested elements which define the attributes of the vendor-specific
+deployment tool being executed. Vendor-specific deployment tools elements may enforce rules for
+which attributes are required, depending on the tool.</p>
-<h3>Parameters:</h3>
-<table>
+<h3>Parameters</h3>
+<table class="attr">
<tr>
- <td valign="top"><b>Attribute</b></td>
- <td valign="top"><b>Description</b></td>
- <td valign="top"><b>Required</b></td>
+ <th>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">action</td>
- <td valign="top">This is the action to be performed. For most cases this
- will be "deploy". Some tools support additional actions, such as "delete", "list",
- "undeploy", "update"...</td>
+ <td>action</td>
+ <td>This is the action to be performed. For most cases this will be <q>deploy</q>. Some tools
+ support additional actions, such
+ as <q>delete</q>, <q>list</q>, <q>undeploy</q>, <q>update</q>, ...</td>
<td>Yes</td>
</tr>
<tr>
- <td valign="top">source</td>
- <td valign="top">A fully qualified path/filename of the component to be deployed.
- This may be an .ear, .jar, .war, or any other type that is supported by the server.
- </td>
+ <td>source</td>
+ <td>A fully qualified path/filename of the component to be deployed. This may be
+ an <samp>.ear</samp>, <samp>.jar</samp>, <samp>.war</samp>, or any other type that is
+ supported by the server.</td>
<td>Tool dependent</td>
</tr>
</table>
<h3>Nested Elements</h3>
-<p>The serverdeploy task supports a nested <code>classpath</code> element to set the classpath.</p>
+<p>The <code>serverdeploy</code> task supports a nested <code>classpath</code> element to set the
+classpath.</p>
<h3>Vendor-specific nested elements</h3>
-<h3>Parameters used for all tools:</h3>
-<table>
+<h3>Parameters used for all tools</h3>
+<table class="attr">
<tr>
- <td valign="top"><b>Attribute</b></td>
- <td valign="top"><b>Description</b></td>
- <td valign="top"><b>Required</b></td>
+ <th>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">classpath</td>
- <td valign="top">The classpath to be passed to the JVM running the tool.
- The classpath may also be supplied as a nested element.</td>
+ <td>classpath</td>
+ <td>The classpath to be passed to the JVM running the tool. The classpath may also be supplied
+ as a nested element.</td>
<td>Tool dependent</td>
</tr>
<tr>
- <td valign="top">server</td>
- <td valign="top">The address or URL for the server where the component will be deployed.</td>
+ <td>server</td>
+ <td>The address or URL for the server where the component will be deployed.</td>
<td>Tool dependent</td>
</tr>
<tr>
- <td valign="top">username</td>
- <td valign="top">The user with privileges to deploy applications to the server.</td>
+ <td>username</td>
+ <td>The user with privileges to deploy applications to the server.</td>
<td>Tool dependent</td>
</tr>
<tr>
- <td valign="top">password</td>
- <td valign="top">The password of the user with privileges to deploy applications to the server.</td>
+ <td>password</td>
+ <td>The password of the user with privileges to deploy applications to the server.</td>
<td>Tool dependent</td>
</tr>
</table>
@@ -129,199 +124,182 @@ attributes are required, depending on the tool.
<p>Also supported are nested vendor-specific elements.</p>
<h3 id="serverdeploy_generic">Generic element</h3>
-This element is provided for generic Java-based deployment tools.
-The generic task accepts (but does not require) nested <code>arg</code>
-and <code>jvmarg</code> elements.
-A JVM will be spawned with the provided attributes. It is recommended
-that a vendor-specific element be used over the generic one if at all
-possible.
+<p>This element is provided for generic Java-based deployment tools. The generic task accepts (but
+does not require) nested <code>arg</code> and <code>jvmarg</code> elements. A JVM will be spawned
+with the provided attributes. It is recommended that a vendor-specific element be used over the
+generic one if at all possible.</p>
<p>The following attributes are supported by the generic element.</p>
-<table>
+<table class="attr">
<tr>
- <td valign="top"><b>Attribute</b></td>
- <td valign="top"><b>Description</b></td>
- <td valign="top"><b>Required</b></td>
+ <th>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">classname</td>
- <td valign="top">This is the fully qualified classname of the Java based
- deployment tool to execute.</td>
+ <td>classname</td>
+ <td>This is the fully qualified classname of the Java based deployment tool to execute.</td>
<td>Yes</td>
</tr>
</table>
<h3>Nested Elements</h3>
-<p>The generic element supports nested <code><arg></code> and <code><jvmarg></code> elements.</p>
+<p>The generic element supports nested <code><arg></code> and <code><jvmarg></code>
+elements.</p>
<h3>Example</h3>
-<p>This example shows the use of generic deploy element to deploy a component
-using a Java based deploy tool:</p>
+<p>This example shows the use of generic deploy element to deploy a component using a Java based
+deploy tool:</p>
<pre>
- <serverdeploy action="deploy" source="${lib.dir}/ejb_myApp.ear">
- <generic classname="com.yamato.j2ee.tools.deploy.DeployTool"
- classpath="${classpath}"
- username="${user.name}"
- password="${user.password}">
- <arg value="-component=WildStar"/>
- <arg value="-force"/>
- <jvmarg value="-ms64m"/>
- <jvmarg value="-mx128m"/>
- </generic>
- </serverdeploy>
-</pre>
+<serverdeploy action="deploy" source="${lib.dir}/ejb_myApp.ear">
+ <generic classname="com.yamato.j2ee.tools.deploy.DeployTool"
+ classpath="${classpath}"
+ username="${user.name}"
+ password="${user.password}">
+ <arg value="-component=WildStar"/>
+ <arg value="-force"/>
+ <jvmarg value="-ms64m"/>
+ <jvmarg value="-mx128m"/>
+ </generic>
+</serverdeploy></pre>
<h3 id="serverdeploy_weblogic">WebLogic element</h3>
-<p>
-The WebLogic element contains additional attributes to run the
-<code>weblogic.deploy</code> deployment tool.
-<p>Valid actions for the tool are <code>deploy</code>, <code>undeploy</code>,
-<code>list</code>, <code>update</code>, and <code>delete</code>.
-<p>If the action is <code>deploy</code> or <code>update</code>,
-the <code>application</code> and <code>source</code> attributes must be set.
-If the action is <code>undeploy</code> or <code>delete</code>,
-the <code>application</code> attribute must be set. If the <code>username</code>
-attribute is omitted, it defaults to "system". The <code>password</code> attribute is
-required for all actions.
-<p>
-<table>
+<p>The WebLogic element contains additional attributes to run the <code>weblogic.deploy</code>
+deployment tool.</p>
+<p>Valid actions for the tool are <q>deploy</q>, <q>undeploy</q>, <q>list</q>, <q>update</q>,
+and <q>delete</q>.</p>
+<p>If the action is <q>deploy</q> or <q>update</q>, the <var>application</var> and <var>source</var>
+attributes must be set. If the action is <q>undeploy</q> or <q>delete</q>,
+the <var>application</var> attribute must be set. If the <var>username</var> attribute is omitted,
+it defaults to <q>system</q>. The <var>password</var> attribute is required for all actions.</p>
+
+<table class="attr">
<tr>
- <td valign="top"><b>Attribute</b></td>
- <td valign="top"><b>Description</b></td>
- <td valign="top"><b>Required</b></td>
+ <th>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">application</td>
- <td valign="top">This is the name of the application being deployed</td>
+ <td>application</td>
+ <td>This is the name of the application being deployed</td>
<td>Yes</td>
</tr>
<tr>
- <td valign="top">component</td>
- <td valign="top">This is the component string for deployment targets.
- It is in the form <code><component>:<target1>,<target2>...</code>
- Where component is the archive name (minus the .jar, .ear, .war
- extension). Targets are the servers where the components will be deployed</td>
+ <td>component</td>
+ <td>This is the component string for deployment targets. It is in the
+ form <code><component>:<target1>,<target2>...</code> Where component is the
+ archive name (minus the <samp>.jar</samp>, <samp>.ear</samp>, <samp>.war</samp> extension).
+ Targets are the servers where the components will be deployed</td>
<td>no</td>
</tr>
<tr>
- <td valign="top">debug</td>
- <td valign="top">If set to true, additional information will be
- printed during the deployment process.</td>
+ <td>debug</td>
+ <td>If set to <q>true</q>, additional information will be printed during the deployment
+ process.</td>
<td>No</td>
</tr>
</table>
-
<h3>Examples</h3>
-<p>This example shows the use of serverdeploy to deploy a component to a WebLogic server:</p>
+<p>This example shows the use of <code>serverdeploy</code> to deploy a component to a WebLogic
+server:</p>
<pre>
- <serverdeploy action="deploy" source="${lib.dir}/ejb_myApp.ear">
- <weblogic application="myapp"
- server="t3://myserver:7001"
- classpath="${weblogic.home}/lib/weblogic.jar"
- username="${user.name}"
- password="${user.password}"
- component="ejb_foobar:myserver,productionserver"
- debug="true"/>
- </serverdeploy>
-</pre>
-
-<p>This example shows serverdeploy being used to delete a component from a
-WebLogic server:</p>
+<serverdeploy action="deploy" source="${lib.dir}/ejb_myApp.ear">
+ <weblogic application="myapp"
+ server="t3://myserver:7001"
+ classpath="${weblogic.home}/lib/weblogic.jar"
+ username="${user.name}"
+ password="${user.password}"
+ component="ejb_foobar:myserver,productionserver"
+ debug="true"/>
+</serverdeploy></pre>
+
+<p>This example shows <code>serverdeploy</code> being used to delete a component from a WebLogic
+server:</p>
<pre>
- <serverdeploy action="delete" source="${lib.dir}/ejb_myApp.jar"/>
- <weblogic application="myapp"
- server="t3://myserver:7001"
- classpath="${weblogic.home}/lib/weblogic.jar"
- username="${user.name}"
- password="${user.password}"/>
- </serverdeploy>
-</pre>
+<serverdeploy action="delete" source="${lib.dir}/ejb_myApp.jar"/>
+ <weblogic application="myapp"
+ server="t3://myserver:7001"
+ classpath="${weblogic.home}/lib/weblogic.jar"
+ username="${user.name}"
+ password="${user.password}"/>
+</serverdeploy></pre>
<h3 id="serverdeploy_jonas">JOnAS (Java Open Application Server) element</h3>
-<p>
-The JOnAS element contains additional attributes to run the
-<code>JonasAdmin</code> deployment tool.
-<p>Valid actions for the tool are <code>deploy</code>, <code>undeploy</code>,
-<code>list</code> and <code>update</code>.
-<p>You can't use <code>user</code> and <code>password</code> property with this
-task.
-<p>
-<table>
+<p>The JOnAS element contains additional attributes to run the <code>JonasAdmin</code> deployment
+tool.</p>
+<p>Valid actions for the tool are <q>deploy</q>, <q>undeploy</q>, <q>list</q> and <q>update</q>.</p>
+<p>You can't use <var>user</var> and <var>password</var> property with this task.</p>
+<table class="attr">
<tr>
- <td valign="top"><b>Attribute</b></td>
- <td valign="top"><b>Description</b></td>
- <td valign="top"><b>Required</b></td>
+ <th>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">jonasroot</td>
- <td valign="top">The root directory for JOnAS.</td>
+ <td>jonasroot</td>
+ <td>The root directory for JOnAS.</td>
<td>Yes</td>
</tr>
<tr>
- <td valign="top">orb</td>
- <td valign="top">Choose your ORB : RMI, JEREMIE, DAVID, ... If omitted, it defaults
- to the one present in classpath. The corresponding JOnAS JAR is
- automatically added to the classpath. If your orb is DAVID (RMI/IIOP) you must
- specify davidhost and davidport properties.</td>
- <td>No</td>
+ <td>orb</td>
+ <td>Choose your ORB: <q>RMI</q>, <q>JEREMIE</q>, <q>DAVID</q>, ... The corresponding JOnAS JAR
+ is automatically added to the classpath. If your <var>orb</var> is <q>DAVID</q> (RMI/IIOP) you
+ must specify <var>davidhost</var> and <var>davidport</var> properties.</td>
+ <td>No; defaults to the ORB present in classpath</td>
</tr>
<tr>
- <td valign="top">davidhost</td>
- <td valign="top">The value for the system property : <code>david.CosNaming.default_host</code> .</td>
+ <td>davidhost</td>
+ <td>The value for the system property: <code>david.CosNaming.default_host</code>.</td>
<td>No</td>
</tr>
<tr>
- <td valign="top">davidport</td>
- <td valign="top">The value for the system property : <code>david.CosNaming.default_port</code> .</td>
+ <td>davidport</td>
+ <td>The value for the system property: <code>david.CosNaming.default_port</code>.</td>
<td>No</td>
</tr>
<tr>
- <td valign="top">classname</td>
- <td valign="top">This is the fully qualified classname of the Java based
- deployment tool to execute. Default to <code>org.objectweb.jonas.adm.JonasAdmin</code></td>
- <td>No</td>
+ <td>classname</td>
+ <td>This is the fully qualified classname of the Java based deployment tool to execute.</td>
+ <td>No; default is <code>org.objectweb.jonas.adm.JonasAdmin</code></td>
</tr>
-
</table>
<h3>Nested Elements</h3>
-<p>The jonas element supports nested <code><arg></code> and <code><jvmarg></code> elements.</p>
-
+<p>The <code>jonas</code> element supports nested <code><arg></code>
+and <code><jvmarg></code> elements.</p>
<h3>Examples</h3>
-<p>This example shows the use of serverdeploy to deploy a component to a JOnAS server:</p>
+<p>This example shows the use of <code>serverdeploy</code> to deploy a component to a JOnAS
+server:</p>
<pre>
- <serverdeploy action="deploy" source="${lib.dir}/ejb_myApp.jar">
- <jonas server="MyJOnAS" jonasroot="${jonas.root}">
-
- <classpath>
- <pathelement path="${jonas.root}/lib/RMI_jonas.jar"/>
- <pathelement path="${jonas.root}/config/"/>
- </classpath>
- </jonas>
- </serverdeploy>
-</pre>
-
-<p>This example shows serverdeploy being used to list the components from a
-JOnAS server and a WebLogic server:</p>
+<serverdeploy action="deploy" source="${lib.dir}/ejb_myApp.jar">
+ <jonas server="MyJOnAS" jonasroot="${jonas.root}">
+ <classpath>
+ <pathelement path="${jonas.root}/lib/RMI_jonas.jar"/>
+ <pathelement path="${jonas.root}/config/"/>
+ </classpath>
+ </jonas>
+</serverdeploy></pre>
+
+<p>This example shows <code>serverdeploy</code> being used to list the components from a JOnAS
+server and a WebLogic server:</p>
<pre>
- <serverdeploy action="list"/>
- <jonas jonasroot="${jonas.root}" orb="JEREMIE"/>
- <weblogic application="myapp"
- server="t3://myserver:7001"
- classpath="${weblogic.home}/lib/weblogic.jar"
- username="${user.name}"
- password="${user.password}"/>
- </serverdeploy>
-</pre>
+<serverdeploy action="list"/>
+ <jonas jonasroot="${jonas.root}" orb="JEREMIE"/>
+ <weblogic application="myapp"
+ server="t3://myserver:7001"
+ classpath="${weblogic.home}/lib/weblogic.jar"
+ username="${user.name}"
+ password="${user.password}"/>
+</serverdeploy></pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/setpermissions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/setpermissions.html b/manual/Tasks/setpermissions.html
index 7ef1449..bab640b 100644
--- a/manual/Tasks/setpermissions.html
+++ b/manual/Tasks/setpermissions.html
@@ -27,83 +27,70 @@
<h2 id="setpermissions">SetPermissions</h2>
<p><em>Since Ant 1.10.0</em>.</p>
<h3>Description</h3>
-<p>Changes the file permissions using Java's NIO support for
- permissions.</p>
-<p>This task provides a subset of the platform specific abilities of
- <a href="chmod.html">chmod</a> and <a href="attrib.html">attrib</a>
- in a platform independent way.</p>
-<p>If no permissions are specified either via the mode or the
- permissions attribute, then all permissions will be removed from the
- nested resources.</p>
-<p>The task accepts arbitrary resources as part of the nested
- resource collections, but not all resources support setting
- permissions. This task won't do anything for resources that don't
- support setting permissions - for example URLs.</p>
-<p>The permissions are applied to all resources contained within the
- nested resources collections. You may want to ensure the collection
- only returns files or directories if you want different sets of
- permissions to apply to either type of resource.</p>
+<p>Changes the file permissions using Java's NIO support for permissions.</p>
+<p>This task provides a subset of the platform specific abilities of <a href="chmod.html">chmod</a>
+and <a href="attrib.html">attrib</a> in a platform independent way.</p>
+<p>If no permissions are specified either via the mode or the permissions attribute, then all
+permissions will be removed from the nested resources.</p>
+<p>The task accepts arbitrary resources as part of the nested resource collections, but not all
+resources support setting permissions. This task won't do anything for resources that don't support
+setting permissions—for example URLs.</p>
+<p>The permissions are applied to all resources contained within the nested resources
+collections. You may want to ensure the collection only returns files or directories if you want
+different sets of permissions to apply to either type of resource.</p>
<h3>Parameters</h3>
-<table>
+<table class="attr">
<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>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">permissions</td>
- <td valign="top">The permissions to set as comma separated list of
- names
- of <a href="http://docs.oracle.com/javase/8/docs/api/java/nio/file/attribute/PosixFilePermission.html">PosixFilePermission</a>
- values.</td>
- <td valign="top" align="center">No</td>
+ <td>permissions</td>
+ <td>The permissions to set as comma separated list of names
+ of <a href="https://docs.oracle.com/javase/8/docs/api/java/nio/file/attribute/PosixFilePermission.html">PosixFilePermission</a>
+ values.</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">mode</td>
- <td valign="top">The permissions to set as traditional Unix
- three-digit octal number.</td>
- <td valign="top" align="center">No</td>
+ <td>mode</td>
+ <td>The permissions to set as traditional Unix three-digit octal number.</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">nonPosixMode</td>
- <td valign="top">What to do if changing the permissions of a file
- is not possible because the file-system doesn't support POSIX
- file permissions. Possible options are <code>fail</code> (fail
- the build), <code>pass</code> (just log an
- error), <code>tryDosOrFail</code> (at least try to set the
- read-only flag on DOS file systems, fail if that isn't possible
- either) and <code>tryDosOrPass</code> (at least try to set the
- read-only flag on DOS file systems, just log an error if that
- isn't possible either).</td>
- <td valign="top" align="center">No, defaults to <code>fail</code></td>
+ <td>nonPosixMode</td>
+ <td>What to do if changing the permissions of a file is not possible because the file-system
+ doesn't support POSIX file permissions. Possible options are <q>fail</q> (fail the
+ build), <q>pass</q> (just log an error), <q>tryDosOrFail</q> (at least try to set the
+ read-only flag on DOS file systems, fail if that isn't possible either)
+ and <q>tryDosOrPass</q> (at least try to set the read-only flag on DOS file systems, just log
+ an error if that isn't possible either).</td>
+ <td>No; defaults to <q>fail</q></td>
</tr>
<tr>
- <td valign="top">failonerror</td>
- <td valign="top">Whether to stop the build if setting permissions
- fails.</td>
- <td valign="top" align="center">No, defaults to true</td>
+ <td>failonerror</td>
+ <td>Whether to stop the build if setting permissions fails.</td>
+ <td>No; defaults to <q>true</q></td>
</tr>
</table>
<h3>Parameters specified as nested elements</h3>
<h4>any resource collection</h4>
-<p><a href="../Types/resources.html#collection">Resource
-Collection</a>s are used to select groups of resources.</p>
+<p><a href="../Types/resources.html#collection">Resource Collection</a>s are used to select groups
+of resources.</p>
<h3>Examples</h3>
<pre>
<setpermissions mode="755">
<file file="${dist}/start.sh"/>
-</setpermissions>
-</pre>
-<p>makes the "start.sh" file readable and executable for
- anyone and in addition writable by the owner.</p>
+</setpermissions></pre>
+<p>makes the <samp>start.sh</samp> file readable and executable for anyone and in addition writable
+by the owner.</p>
<pre>
<setpermissions permissions="OWNER_READ,OWNER_WRITE,OWNER_EXECUTE,OTHERS_READ,OTHERS_EXECUTE,GROUP_READ,GROUP_EXECUTE">
<file file="${dist}/start.sh"/>
-</setpermissions>
-</pre>
-<p>makes the "start.sh" file readable and executable for
- anyone and in addition writable by the owner.</p>
+</setpermissions></pre>
+<p>makes the <samp>start.sh</samp> file readable and executable for anyone and in addition writable
+by the owner.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/setproxy.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/setproxy.html b/manual/Tasks/setproxy.html
index a191dda..91bcecd 100644
--- a/manual/Tasks/setproxy.html
+++ b/manual/Tasks/setproxy.html
@@ -26,115 +26,74 @@
<h2>Setproxy Task</h2>
<h3 id="description">Description</h3>
-Sets Java's web proxy properties, so that tasks and code run in the same JVM can have through-the-firewall access to remote web sites, and remote ftp sites. You can nominate an http and ftp proxy, or a socks server, reset the server settings, or do nothing at all.
-
-<h3>Examples</h3>
-<pre><setproxy/></pre> do nothing
-<pre><setproxy proxyhost="firewall"/></pre> set the proxy to firewall:80
-<pre><setproxy proxyhost="firewall" proxyport="81"/></pre> set the proxy to firewall:81
-<pre><setproxy proxyhost=""/></pre> stop using the http proxy; don't change the socks settings
-<pre><setproxy socksproxyhost="socksy"/></pre> use socks via socksy:1080
-<pre><setproxy socksproxyhost=""/></pre> stop using the socks server.
-<p>
-You can set a username and password for http with the <tt>proxyHost</tt> and <tt>proxyPassword</tt> attributes. On Java 1.4 and above these can also be used against SOCKS5 servers.
-</p>
+<p>Sets Java's web proxy properties, so that tasks and code run in the same JVM can have
+through-the-firewall access to remote web sites, and remote FTP sites. You can nominate an HTTP and
+FTP proxy, or a SOCKS server, reset the server settings, or do nothing at all.</p>
<h3 id="attributes">Parameters</h3>
-<table>
+<table class="attr">
<tr>
- <td valign="top" align="left">
- <b>Attribute</b>
- </td>
- <td valign="top" align="left">
- <b>Description</b>
- </td>
- <td valign="top" align="left">
- <b>Type</b>
- </td>
- <td valign="top" align="left">
- <b>Requirement</b>
- </td>
+ <th>Attribute</th>
+ <th>Description</th>
+ <th>Type</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top" align="left">
- nonproxyhosts
- </td>
- <td valign="top" align="left">
- A list of hosts to bypass the proxy on. These should be separated with the vertical bar character '|'. Only in Java 1.4 does ftp use this list. e.g. fozbot.corp.sun.com|*.eng.sun.com
- </td>
- <td valign="top" align="left">
- String
- </td>
- <td valign="top" align="left" rowspan="7">
- Optional
- </td>
+ <td>nonproxyhosts</td>
+ <td>A list of hosts to bypass the proxy on. These should be separated with the vertical bar
+ character <q>|</q>. Only in Java 1.4 does FTP use this
+ list. e.g. <samp>fozbot.corp.sun.com|*.eng.sun.com</samp></td>
+ <td>String</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top" align="left">
- proxyhost
- </td>
- <td valign="top" align="left">
- the HTTP/ftp proxy host. Set this to "" for the http proxy option to be disabled
- </td>
- <td valign="top" align="left">
- String
- </td>
+ <td>proxyhost</td>
+ <td>the HTTP/FTP proxy host. Set this to <q></q> for the HTTP proxy option to be disabled.</td>
+ <td>String</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top" align="left">
- proxypassword
- </td>
- <td valign="top" align="left">
- Set the password for the proxy. Used only if the proxyUser is set.
- </td>
- <td valign="top" align="left">
- String
- </td>
+ <td>proxypassword</td>
+ <td>Set the password for the proxy. Used only if the <var>proxyUser</var> is set.</td>
+ <td>String</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top" align="left">
- proxyport
- </td>
- <td valign="top" align="left">
- the HTTP/ftp proxy port number; default is 80
- </td>
- <td valign="top" align="left">
- int
- </td>
+ <td>proxyport</td>
+ <td>the HTTP/FTP proxy port number</td>
+ <td>int</td>
+ <td>No; default is <q>80</q></td>
</tr>
<tr>
- <td valign="top" align="left">
- proxyuser
- </td>
- <td valign="top" align="left">
- set the proxy user. Probably requires a password to accompany this setting. Default=""
- </td>
- <td valign="top" align="left">
- String
- </td>
+ <td>proxyuser</td>
+ <td>set the proxy user. Probably requires a password to accompany this setting.</td>
+ <td>String</td>
+ <td>No; default is <q></q></td>
</tr>
<tr>
- <td valign="top" align="left">
- socksproxyhost
- </td>
- <td valign="top" align="left">
- The name of a Socks server. Set to "" to turn socks proxying off.
- </td>
- <td valign="top" align="left">
- String
- </td>
+ <td>socksproxyhost</td>
+ <td>The name of a SOCKS server. Set to <q></q> to turn SOCKS proxying off.</td>
+ <td>String</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top" align="left">
- socksproxyport
- </td>
- <td valign="top" align="left">
- Set the ProxyPort for socks connections. The default value is 1080
- </td>
- <td valign="top" align="left">
- int
- </td>
+ <td>socksproxyport</td>
+ <td>Set the ProxyPort for SOCKS connections.</td>
+ <td>int</td>
+ <td>No; default is <q>1080</q></td>
</tr>
</table>
+
+<h3>Examples</h3>
+<pre><setproxy/></pre> do nothing
+<pre><setproxy proxyhost="firewall"/></pre> set the proxy to firewall:80
+<pre><setproxy proxyhost="firewall" proxyport="81"/></pre> set the proxy to <samp>firewall:81</samp>
+<pre><setproxy proxyhost=""/></pre> stop using HTTP proxy; don't change SOCKS settings
+<pre><setproxy socksproxyhost="socksy"/></pre> use SOCKS via socksy:1080
+<pre><setproxy socksproxyhost=""/></pre> stop using the SOCKS server.
+<p>You can set a username and password for http with the <var>proxyHost</var>
+and <var>proxyPassword</var> attributes. On Java 1.4 and above these can also be used against SOCKS
+5 servers.</p>
+
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/signjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html
index e414db9..2d6abf6 100644
--- a/manual/Tasks/signjar.html
+++ b/manual/Tasks/signjar.html
@@ -27,276 +27,248 @@
<h2 id="signjar">SignJar</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>.
-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
-directory or explicit JAR file name is not provided, JARs are signed in place.
-</p>
-<p>
-Dependency rules
-</p>
+<p>Signs JAR files with the <a target="_blank"
+href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html"><code>jarsigner</code>
+command line tool</a>. It will take a named file in the <var>jar</var> attribute, and an
+optional <var>destDir</var> or <var>signedJar</var> attribute. Nested paths are also supported; here
+only an (optional) <var>destDir</var> is allowed. If a destination directory or explicit JAR file
+name is not provided, JARs are signed in place.</p>
+<p>Dependency rules</p>
<ul>
-<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
-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>
+ <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 <var>lazy</var> is <q>true</q>, 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 <var>lazy</var> is <q>false</q>, the
+ JAR is signed.</li>
</ul>
<h3>Parameters</h3>
-<table>
+<table class="attr">
<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>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">jar</td>
- <td valign="top">the jar file to sign</td>
- <td valign="top" align="center">Yes, unless nested paths have
- been used.</td>
+ <td>jar</td>
+ <td>the jar file to sign</td>
+ <td>Yes, unless nested paths have been used</td>
</tr>
<tr>
- <td valign="top">alias</td>
- <td valign="top">the alias to sign under</td>
- <td valign="top" align="center">Yes.</td>
+ <td>alias</td>
+ <td>the alias to sign under</td>
+ <td>Yes</td>
</tr>
<tr>
- <td valign="top">storepass</td>
- <td valign="top">password for keystore integrity.</td>
- <td valign="top" align="center">Yes.</td>
+ <td>storepass</td>
+ <td>password for keystore integrity.</td>
+ <td>Yes</td>
</tr>
<tr>
- <td valign="top">keystore</td>
- <td valign="top">keystore location</td>
- <td valign="top" align="center">No</td>
+ <td>keystore</td>
+ <td>keystore location</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">storetype</td>
- <td valign="top">keystore type</td>
- <td valign="top" align="center">No</td>
+ <td>storetype</td>
+ <td>keystore type</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">keypass</td>
- <td valign="top">password for private key (if different)</td>
- <td valign="top" align="center">No</td>
+ <td>keypass</td>
+ <td>password for private key (if different)</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">sigfile</td>
- <td valign="top">name of .SF/.DSA file</td>
- <td valign="top" align="center">No</td>
+ <td>sigfile</td>
+ <td>name of <samp>.SF</samp>/<samp>.DSA</samp> file</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">signedjar</td>
- <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>
+ <td>signedjar</td>
+ <td>name of signed JAR file. This can only be set when the <var>jar</var> attribute is set.</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">verbose</td>
- <td valign="top">(true | false) verbose output when signing</td>
- <td valign="top" align="center">No; default false</td>
+ <td>verbose</td>
+ <td>(<q>true|false</q>) verbose output when signing</td>
+ <td>No; default <q>false</q></td>
</tr>
<tr>
- <td valign="top">strict</td>
- <td valign="top">(true | false) strict checking when signing.<br/><em>since Ant 1.9.1</em>.</td>
- <td valign="top" align="center">No; default false</td>
+ <td>strict</td>
+ <td>(<q>true|false</q>) strict checking when signing.<br/><em>since Ant 1.9.1</em>.</td>
+ <td>No; default <q>false</q></td>
</tr>
<tr>
- <td valign="top">internalsf</td>
- <td valign="top">(true | false) include the .SF file inside the signature
-block</td>
- <td valign="top" align="center">No; default false</td>
+ <td>internalsf</td>
+ <td>(<q>true|false</q>) include the <samp>.SF</samp> file inside the signature block</td>
+ <td>No; default <q>false</q></td>
</tr>
<tr>
- <td valign="top">sectionsonly</td>
- <td valign="top">(true | false) don't compute hash of entire manifest</td>
- <td valign="top" align="center">No; default false</td>
+ <td>sectionsonly</td>
+ <td>(<q>true|false</q>) don't compute hash of entire manifest</td>
+ <td>No; default <q>false</q></td>
</tr>
<tr>
- <td valign="top">lazy</td>
- <td valign="top">flag to control whether the presence of a signature
- file means a JAR is signed. This is only used when the target JAR matches
- the source JAR</td>
- <td valign="top" align="center">No; default false</td>
+ <td>lazy</td>
+ <td>flag to control whether the presence of a signature file means a JAR is signed. This is only
+ used when the target JAR matches the source JAR</td>
+ <td>No; default <q>false</q></td>
</tr>
<tr>
- <td valign="top">maxmemory</td>
- <td valign="top">Specifies the maximum memory the jarsigner VM will use. Specified in the
- style of standard java memory specs (e.g. 128m = 128 MBytes)</td>
- <td valign="top" align="center">No</td>
+ <td>maxmemory</td>
+ <td>Specifies the maximum memory the <code>jarsigner</code> JVM will use. Specified in the style
+ of standard Java memory specs (e.g. <q>128m</q> = 128 MBytes)</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">preservelastmodified</td>
- <td valign="top">Give the signed files the same last modified
- time as the original jar files.</td>
- <td valign="top" align="center">No; default false.</td>
+ <td>preservelastmodified</td>
+ <td>Give the signed files the same last modified time as the original jar files.</td>
+ <td>No; default <q>false</q>.</td>
</tr>
<tr>
- <td valign="top">tsaurl</td>
- <td valign="top">URL for a timestamp authority for timestamped
- JAR files in Java 5+</td>
- <td valign="top" align="center">No</td>
+ <td>tsaurl</td>
+ <td>URL for a timestamp authority for timestamped JAR files in Java 5+</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">tsacert</td>
- <td valign="top">alias in the keystore for a timestamp authority for
- timestamped JAR files in Java 5+</td>
- <td valign="top" align="center">No</td>
+ <td>tsacert</td>
+ <td>alias in the keystore for a timestamp authority for timestamped JAR files in Java 5+</td>
+ <td>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>
+ <td>tsaproxyhost</td>
+ <td>proxy host to be used when connecting to TSA server</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">tsaproxyport</td>
- <td valign="top">proxy port to be used when connecting to TSA server</td>
- <td valign="top" align="center">No</td>
+ <td>tsaproxyport</td>
+ <td>proxy port to be used when connecting to TSA server</td>
+ <td>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
- Apache Ant is running in).<br/>
- Must support the same command line options as the Sun JDK
- jarsigner command.
- <em>since Ant 1.8.0</em>.</td>
- <td align="center" valign="top">No</td>
+ <td>executable</td>
+ <td>Specify a particular <code>jarsigner</code> executable to use in place of the default binary
+ (found in the same JDK as Apache Ant is running in).<br/>Must support the same command line
+ options as the Sun JDK <code>jarsigner</code> command. <em>since Ant 1.8.0</em>.</td>
+ <td>No</td>
</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>
+ <td>force</td>
+ <td>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>No; default <q>false</q></td>
</tr>
<tr>
- <td valign="top">sigalg</td>
- <td valign="top">name of signature algorithm</td>
- <td valign="top" align="center">No</td>
+ <td>sigalg</td>
+ <td>name of signature algorithm</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">digestalg</td>
- <td valign="top">name of digest algorithm</td>
- <td valign="top" align="center">No</td>
+ <td>digestalg</td>
+ <td>name of digest algorithm</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">tsadigestalg</td>
- <td valign="top">name of tsa digest algorithm. <em>since Ant 1.10.2</em></td>
- <td valign="top" align="center">No</td>
+ <td>tsadigestalg</td>
+ <td>name of TSA digest algorithm. <em>since Ant 1.10.2</em></td>
+ <td>No</td>
</tr>
</table>
<h3>Parameters as nested elements</h3>
-<table>
+<table class="attr">
<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>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">path</td>
- <td valign="top">path of JAR files to sign. <em>since Ant 1.7</em></td>
- <td valign="top" align="center">No</td>
+ <td>path</td>
+ <td>path of JAR files to sign. <em>since Ant 1.7</em></td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">fileset</td>
- <td valign="top">fileset of JAR files to sign.</td>
- <td valign="top" align="center">No</td>
+ <td>fileset</td>
+ <td>fileset of JAR files to sign.</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">mapper</td>
- <td valign="top">A mapper to rename jar files during signing</td>
- <td valign="top" align="center">No, and only one can be supplied</td>
+ <td>mapper</td>
+ <td>A mapper to rename jar files during signing</td>
+ <td>No, and only one can be supplied</td>
</tr>
<tr>
- <td valign="top">sysproperty</td>
- <td valign="top">JVM system properties, with the syntax of Ant
- <a href="exec.html#env">environment variables</a></td>
- <td valign="top" align="center">No, and only one can be supplied</td>
+ <td>sysproperty</td>
+ <td>JVM system properties, with the syntax of Ant <a href="exec.html#env">environment
+ variables</a></td>
+ <td>No, and only one can be supplied</td>
</tr>
</table>
<h3>Examples</h3>
-<p>For instructions on generating a code signing certificate, see the <a target="_blank" href="http://docs.oracle.com/javase/7/docs/technotes/tools/windows/keytool.html">keytool documentation</a> and/or instructions from your certificate authority.</p>
+<p>For instructions on generating a code signing certificate, see the <a target="_blank"
+href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/keytool.html">keytool
+documentation</a> and/or instructions from your certificate authority.</p>
<pre>
<signjar jar="${dist}/lib/ant.jar"
-alias="apache-group" storepass="secret"/>
-</pre>
-<p>
- signs the ant.jar with alias "apache-group" accessing the
- keystore and private key via "secret" password.
-</p>
+ alias="apache-group" storepass="secret"/></pre>
+<p>signs the <samp>ant.jar</samp> with alias <q>apache-group</q> accessing the keystore and private
+key via <q>secret</q> password.</p>
<pre>
<signjar destDir="signed"
- alias="testonly" keystore="testkeystore"
- storepass="apacheant"
- preservelastmodified="true">
+ alias="testonly" keystore="testkeystore"
+ storepass="apacheant"
+ preservelastmodified="true">
<path>
- <fileset dir="dist" includes="**/*.jar" />
+ <fileset dir="dist" includes="**/*.jar"/>
</path>
- <flattenmapper />
-</signjar>
-</pre>
-<p>
-Sign all JAR files matching the dist/**/*.jar pattern, copying them to the
-directory "signed" afterwards. The flatten mapper means that they will
-all be copied to this directory, not to subdirectories.
-</p>
+ <flattenmapper/>
+</signjar></pre>
+<p>Sign all JAR files matching the <samp>dist/**/*.jar</samp> pattern, copying them to the
+directory <samp>signed</samp> afterwards. The flatten mapper means that they will all be copied to
+this directory, not to subdirectories.</p>
<pre>
-<signjar
- alias="testonly" keystore="testkeystore"
- storepass="apacheant"
- lazy="true"
- >
+<signjar alias="testonly" keystore="testkeystore"
+ storepass="apacheant"
+ lazy="true">
<path>
- <fileset dir="dist" includes="**/*.jar" />
+ <fileset dir="dist" includes="**/*.jar"/>
</path>
-</signjar>
-</pre>
-<p>
-Sign all the JAR files in dist/**/*.jar <i>in-situ</i>. Lazy signing is used,
-so the files will only be signed if they are not already signed.
-</p>
+</signjar></pre>
+<p>Sign all the JAR files in <samp>dist/**/*.jar</samp> <em>in-situ</em>. Lazy signing is used, so
+the files will only be signed if they are not already signed.</p>
<pre>
-<signjar
- alias="testonly" keystore="testkeystore"
- storepass="apacheant"
- sigalg="MD5withRSA"
- digestalg="SHA1">
+<signjar alias="testonly" keystore="testkeystore"
+ storepass="apacheant"
+ sigalg="MD5withRSA"
+ digestalg="SHA1">
<path>
- <fileset dir="dist" includes="**/*.jar" />
+ <fileset dir="dist" includes="**/*.jar"/>
</path>
-</signjar>
-</pre>
-<p>
-Sign all the JAR files in dist/**/*.jar using the digest algorithm SHA1 and the
-signature algorithm MD5withRSA. This is especially useful when you want to use
-the JDK 7 jarsigner (which uses SHA256 and SHA256withRSA as default) to create
-signed jars that will be deployed on platforms not supporting SHA256 and
-SHA256withRSA.
-</p>
+</signjar></pre>
+<p>Sign all the JAR files in <samp>dist/**/*.jar</samp> using the digest algorithm SHA1 and the
+signature algorithm MD5withRSA. This is especially useful when you want to use the JDK
+7 <code>jarsigner</code> (which uses SHA256 and SHA256withRSA as default) to create signed jars that
+will be deployed on platforms not supporting SHA256 and SHA256withRSA.</p>
<h3>About timestamp signing</h3>
-<p>Timestamps record the date and time that a signature took place, allowing the signature to be verified as of that point in time.
-With trusted timestamping, users can verify that signing occurred before a certificate's expiration or revocation. Without this timestamp, users can only verify the signature as of their current date.</p>
+<p>Timestamps record the date and time that a signature took place, allowing the signature to be
+verified as of that point in time. With trusted timestamping, users can verify that signing
+occurred before a certificate's expiration or revocation. Without this timestamp, users can only
+verify the signature as of their current date.</p>
-<p>
-Timestamped JAR files were introduced in Java 5 and supported <em>since Ant 1.7</em>.
-<em>Since Ant 1.9.5</em>, Ant can use unauthenticated proxies for this signing process.
-</p>
+<p>Timestamped JAR files were introduced in Java 5 and supported <em>since Ant 1.7</em>. <em>Since
+Ant 1.9.5</em>, Ant can use unauthenticated proxies for this signing process.</p>
<p>Common public timestamp authorities include</p>
- <ul>
- <li>http://timestamp.verisign.com</li>
- <li>http://tsa.starfieldtech.com</li>
- <li>https://timestamp.geotrust.com/tsa</li>
- <li>Others (see your certificate authority)</li>
- </ul>
+<ul>
+ <li>http://timestamp.verisign.com</li>
+ <li>http://tsa.starfieldtech.com</li>
+ <li>https://timestamp.geotrust.com/tsa</li>
+ <li>Others (see your certificate authority)</li>
+</ul>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/sleep.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sleep.html b/manual/Tasks/sleep.html
index d6e4d10..88256d8 100644
--- a/manual/Tasks/sleep.html
+++ b/manual/Tasks/sleep.html
@@ -25,61 +25,56 @@
<h2 id="sleep">Sleep</h2>
<h3>Description</h3>
-<p>
-A task for sleeping a short period of time, useful when a build or deployment
-process requires an interval between tasks.
-</p>
+<p>A task for sleeping a short period of time, useful when a build or deployment process requires an
+interval between tasks.</p>
<h3>Parameters</h3>
-<table>
+<table class="attr">
<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>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">hours</td>
- <td valign="top">hours to to add to the sleep time</td>
- <td valign="top" align="center">No</td>
+ <td>hours</td>
+ <td>hours to to add to the sleep time</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">minutes</td>
- <td valign="top"> minutes to add to the sleep time</td>
- <td valign="top" align="center">No</td>
+ <td>minutes</td>
+ <td>minutes to add to the sleep time</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">seconds</td>
- <td valign="top">seconds to add to the sleep time</td>
- <td align="center" valign="top">No</td>
+ <td>seconds</td>
+ <td>seconds to add to the sleep time</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">milliseconds</td>
- <td valign="top">milliseconds to add to the sleep time</td>
- <td align="center" valign="top">No</td>
+ <td>milliseconds</td>
+ <td>milliseconds to add to the sleep time</td>
+ <td>No</td>
</tr>
<tr>
- <td valign="top">failonerror</td>
- <td valign="top">flag controlling whether to break the build on an error.
- </td>
- <td align="center" valign="top">No</td>
+ <td>failonerror</td>
+ <td>flag controlling whether to break the build on an error</td>
+ <td>No</td>
</tr>
</table>
-<p>The sleep time is the sum of specified values, hours, minutes seconds and milliseconds.
- A negative value can be supplied to any of them provided the total sleep time
- is positive</p>
-<p>Note that sleep times are always hints to be interpreted by the OS how it feels
- - small times may either be ignored or rounded up to a minimum timeslice. Note
- also that the system clocks often have a fairly low granularity too, which complicates
- measuring how long a sleep actually took.</p>
+<p>The sleep time is the sum of specified values, hours, minutes seconds and milliseconds. A
+negative value can be supplied to any of them provided the total sleep time is positive</p>
+<p>Note that sleep times are always hints to be interpreted by the OS how it feels—small times
+may either be ignored or rounded up to a minimum timeslice. Note also that the system clocks often
+have a fairly low granularity too, which complicates measuring how long a sleep actually took.</p>
<h3>Examples</h3>
-<pre> <sleep milliseconds="10"/></pre>
-Sleep for about 10 mS.
-<pre> <sleep seconds="2"/></pre>
-Sleep for about 2 seconds.
-<pre> <sleep hours="1" minutes="-59" seconds="-58"/></pre>
-<p>Sleep for one hour less 59:58, or two seconds again</p>
-<pre> <sleep/></pre>
-Sleep for no time at all. This may yield the CPU time to another thread or process.
+<pre><sleep milliseconds="10"/></pre>
+<p>Sleep for about 10 ms.</p>
+<pre><sleep seconds="2"/></pre>
+<p>Sleep for about 2 seconds.</p>
+<pre><sleep hours="1" minutes="-59" seconds="-58"/></pre>
+<p>Sleep for one hour less 59:58, or two seconds again.</p>
+<pre><sleep/></pre>
+<p>Sleep for no time at all. This may yield the CPU time to another thread or process.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/sos.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sos.html b/manual/Tasks/sos.html
index f590f69..f071fe2 100644
--- a/manual/Tasks/sos.html
+++ b/manual/Tasks/sos.html
@@ -21,65 +21,59 @@
</head>
<body>
-<div align="center">
<h1>SourceOffSite Tasks User Manual</h1>
-
-<div align="left">by
+<p>by</p>
<ul>
-<li><a href="mailto:jesse@cryptocard.com">Jesse Stockall</a></li>
+ <li><a href="mailto:jesse@cryptocard.com">Jesse Stockall</a></li>
</ul>
-<p>
-Version 1.1 2002/01/23
-</p>
+<p>Version 1.1 2002/01/23</p>
+
<hr/>
<h2>Contents</h2>
<ul>
- <li><a href="#intro">Introduction</a></li>
- <li><a href="#tasks">The Tasks</a></li>
+ <li><a href="#intro">Introduction</a></li>
+ <li><a href="#tasks">The Tasks</a></li>
</ul>
-<br>
<h2 id="intro">Introduction</h2>
-<p>These tasks provide an interface to the <a href="http://msdn.microsoft.com/ssafe/default.asp" target="_top">
-Microsoft Visual SourceSafe</a> SCM via <a href="http://www.sourcegear.com">
-SourceGear's</a> <a href="http://sourcegear.com/sos/index.htm">SourceOffSite</a>
-product. SourceOffSite is an add-on to Microsoft's VSS, that allows remote
-development teams and tele-commuters that need fast and secure read/write
-access to a centralized SourceSafe database via any TCP/IP connection. SOS
-provides Linux ,Solaris & Windows clients. The
-<code> org.apache.tools.ant.taskdefs.optional.sos</code>
-package consists of a simple framework to support SOS functionality as well
-as some Apache Ant tasks encapsulating frequently used SOS commands. Although it
-is possible to use these commands on the desktop, they were primarily intended
-to be used by automated build systems. These tasks have been tested with
-SourceOffSite version 3.5.1 connecting to VisualSourceSafe 6.0. The tasks
-have been tested with Linux, Solaris & Windows2000.</p>
+<p>These tasks provide an interface to
+the <a href="https://msdn.microsoft.com/en-us/library/3h0544kx(v=vs.80).aspx"
+target="_top">Microsoft Visual SourceSafe</a> SCM
+via <a href="https://sourcegear.com">SourceGear's</a> <a href="https://sourcegear.com/sos/">SourceOffSite</a>
+product. SourceOffSite is an add-on to Microsoft's VSS, that allows remote development teams and
+tele-commuters that need fast and secure read/write access to a centralized SourceSafe database via
+any TCP/IP connection. SOS provides Linux, Solaris & Windows
+clients. The <code>org.apache.tools.ant.taskdefs.optional.sos</code> package consists of a simple
+framework to support SOS functionality as well as some Apache Ant tasks encapsulating frequently
+used SOS commands. Although it is possible to use these commands on the desktop, they were
+primarily intended to be used by automated build systems. These tasks have been tested with
+SourceOffSite version 3.5.1 connecting to VisualSourceSafe 6.0. The tasks have been tested with
+Linux, Solaris & Windows 2000.</p>
<h2 id="tasks">The Tasks</h2>
<table>
- <tbody>
- <tr>
- <td><a href="#SOSGet">sosget</a></td>
- <td>Retrieves a read-only copy of the specified project or file.</td>
- </tr>
- <tr>
- <td><a href="#SOSLabel">soslabel</a></td>
- <td>Assigns a label to the specified project.</td>
- </tr>
- <tr>
- <td><a href="#SOSCheckIn">soscheckin</a></td>
- <td>Updates VSS with changes made to a checked out file or project,
- and unlocks the VSS master copy.</td>
- </tr>
- <tr>
- <td><a href="#SOSCheckOut">soscheckout</a></td>
- <td>Retrieves a read-write copy of the specified project
- or file, locking the VSS master copy</td>
- </tr>
-
+ <tbody>
+ <tr>
+ <td><a href="#SOSGet">sosget</a></td>
+ <td>Retrieves a read-only copy of the specified project or file.</td>
+ </tr>
+ <tr>
+ <td><a href="#SOSLabel">soslabel</a></td>
+ <td>Assigns a label to the specified project.</td>
+ </tr>
+ <tr>
+ <td><a href="#SOSCheckIn">soscheckin</a></td>
+ <td>Updates VSS with changes made to a checked out file or project,
+ and unlocks the VSS master copy.</td>
+ </tr>
+ <tr>
+ <td><a href="#SOSCheckOut">soscheckout</a></td>
+ <td>Retrieves a read-write copy of the specified project or file, locking the VSS master
+ copy</td>
+ </tr>
</tbody>
</table>
<hr/>
@@ -87,95 +81,94 @@ have been tested with Linux, Solaris & Windows2000.</p>
<h2 id="SOSGet">SOSGet</h2>
<h3>Description</h3>
- Task to perform GET commands with SOS<br>
+<p>Task to perform <var>Get</var> commands with SOS</p>
<h3>Parameters</h3>
- </div>
- </div>
-<table>
- <tbody>
- <tr>
- <th>Attribute</th>
- <th>Values</th>
- <th>Required</th>
- </tr>
- <tr>
- <td>soscmd</td>
- <td>Directory which contains soscmd(.exe) <br>
- soscmd(.exe) must be in the path if this is not specified</td>
- <td>No</td>
- </tr>
- <tr>
- <td>vssserverpath</td>
- <td>path to the srcsafe.ini - eg. \\server\vss\srcsafe.ini</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>sosserverpath</td>
- <td>address & port of the SOS server - eg. 192.168.0.1:8888</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>projectpath</td>
- <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>file</td>
- <td>Filename to act upon<br>
- If no file is specified then act upon the project</td>
- <td>No</td>
- </tr>
- <tr>
- <td>username</td>
- <td>SourceSafe username</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>password</td>
- <td>SourceSafe password</td>
- <td>No</td>
- </tr>
- <tr>
- <td>localpath</td>
- <td>Override the working directory and get to the specified path</td>
- <td>No</td>
- </tr>
- <tr>
- <td>soshome</td>
- <td>The path to the SourceOffSite home directory</td>
- <td>No</td>
- </tr>
- <tr>
- <td>nocompress</td>
- <td>true or false - disable compression</td>
- <td>No</td>
- </tr>
- <tr>
- <td>recursive</td>
- <td>true or false - Only works with the GetProject command</td>
- <td>No</td>
- </tr>
- <tr>
- <td>version</td>
- <td>a version number to get - Only works with the GetFile command</td>
- <td>No</td>
- </tr>
- <tr>
- <td>label</td>
- <td>a label version to get - Only works with the GetProject command</td>
- <td>No</td>
- </tr>
- <tr>
- <td>nocache</td>
- <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
- <td>No</td>
- </tr>
- <tr>
- <td>verbose</td>
- <td>true or false - Status messages are displayed</td>
- <td>No</td>
- </tr>
+<table class="attr">
+ <thead>
+ <tr>
+ <th>Attribute</th>
+ <th>Values</th>
+ <th>Required</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>soscmd</td>
+ <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>No; by default, the executable must be in the path</td>
+ </tr>
+ <tr>
+ <td>vssserverpath</td>
+ <td>path to the <samp>srcsafe.ini</samp>—eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>sosserverpath</td>
+ <td>address & port of the SOS server—eg. <samp>192.168.0.1:8888</samp></td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>projectpath</td>
+ <td>SourceSafe project path—eg. <samp>$/SourceRoot/Project1</samp></td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>file</td>
+ <td>Filename to act upon</td>
+ <td>No; by default, act upon the project</td>
+ </tr>
+ <tr>
+ <td>username</td>
+ <td>SourceSafe username</td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>password</td>
+ <td>SourceSafe password</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>localpath</td>
+ <td>Override the working directory and get to the specified path</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>soshome</td>
+ <td>The path to the SourceOffSite home directory</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>nocompress</td>
+ <td><q>true|false</q>—disable compression</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>recursive</td>
+ <td><q>true|false</q>—Only works with the <var>GetProject</var> command</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>version</td>
+ <td>a version number to get—Only works with the <var>GetFile</var> command</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>label</td>
+ <td>a label version to get—Only works with the <var>GetProject</var> command</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>nocache</td>
+ <td><q>true|false</q>—Only needed if <code>SOSHOME</code> is set as an environment
+ variable</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>verbose</td>
+ <td><q>true|false</q>—Status messages are displayed</td>
+ <td>No</td>
+ </tr>
</tbody>
</table>
@@ -189,74 +182,72 @@ have been tested with Linux, Solaris & Windows2000.</p>
localpath="tmp"
projectpath="$/SourceRoot/project1"
sosserverpath="192.168.10.6:8888"
- vssserverpath="d:\vss\srcsafe.ini"/>
-</pre>
-<p>
-<small>Connects to a SourceOffsite server on 192.168.10.6:8888 with
-build,build as the username & password. The SourceSafe database resides
-on the same box as the SOS server & the VSS database is at
-"d:\vss\srcsafe.ini" Does a recursive GetProject on
-$/SourceRoot/project1, using tmp as the working
-directory. </small>
-</p>
+ vssserverpath="d:\vss\srcsafe.ini"/></pre>
+<p>Connects to a SourceOffsite server on <samp>192.168.10.6:8888</samp>
+with <q>build</q>, <q>build</q> as the username & password. The SourceSafe database resides on
+the same box as the SOS server & the VSS database is at <samp>d:\vss\srcsafe.ini</samp>. Does a
+recursive <var>GetProject</var> on <samp>$/SourceRoot/project1</samp>, using <samp>tmp</samp> as the
+working directory.</p>
<hr/>
<h2 id="SOSLabel">SOSLabel</h2>
<h3>Description</h3>
- Task to perform Label commands with SOS<br>
+<p>Task to perform <var>Label</var> commands with SOS</p>
<h3>Parameters</h3>
-<table>
- <tbody><tr>
+<table class="attr">
+ <thead>
+ <tr>
<th>Attribute</th>
<th>Values</th>
<th>Required</th>
</tr>
+ </thead>
+ <tbody>
<tr>
<td>soscmd</td>
- <td>Directory which contains soscmd(.exe) <br>
- soscmd(.exe) must be in the path if this is not specified</td>
- <td>No</td>
+ <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>No; by default, the executable must be in the path</td>
</tr>
<tr>
- <td>vssserverpath</td>
- <td>path to the srcsafe.ini - eg. \\server\vss\srcsafe.ini</td>
- <td>Yes</td>
+ <td>vssserverpath</td>
+ <td>path to the <samp>srcsafe.ini</samp>—eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>sosserverpath</td>
- <td>address and port of the SOS server - eg. 192.168.0.1:8888</td>
- <td>Yes</td>
+ <td>sosserverpath</td>
+ <td>address and port of the SOS server—eg. <samp>192.168.0.1:8888</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>projectpath</td>
- <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
- <td>Yes</td>
+ <td>projectpath</td>
+ <td>SourceSafe project path—eg. <samp>$/SourceRoot/Project1</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>username</td>
- <td>SourceSafe username</td>
- <td>Yes</td>
+ <td>username</td>
+ <td>SourceSafe username</td>
+ <td>Yes</td>
</tr>
<tr>
- <td>password</td>
- <td>SourceSafe password</td>
- <td>No</td>
+ <td>password</td>
+ <td>SourceSafe password</td>
+ <td>No</td>
</tr>
<tr>
- <td>label</td>
- <td>The label to apply to a project</td>
- <td>Yes</td>
+ <td>label</td>
+ <td>The label to apply to a project</td>
+ <td>Yes</td>
</tr>
<tr>
- <td>comment</td>
- <td>A comment to be applied to all files being labeled</td>
- <td>No</td>
+ <td>comment</td>
+ <td>A comment to be applied to all files being labeled</td>
+ <td>No</td>
</tr>
<tr>
<td>verbose</td>
- <td>true or false - Status messages are displayed</td>
+ <td><q>true|false</q>—Status messages are displayed</td>
<td>No</td>
</tr>
</tbody>
@@ -269,100 +260,99 @@ directory. </small>
label="test label"
projectpath="$/SourceRoot/project1"
sosserverpath="192.168.10.6:8888"
- vssserverpath="d:\vss\srcsafe.ini"/>
-</pre>
-<p>
-<small>Connects to a SourceOffsite server on 192.168.10.6:8888 with
-build,build as the username & password. The SourceSafe database resides
-on the same box as the SOS server & the VSS database is at
-"d:\vss\srcsafe.ini". Labels the $/SourceRoot/project1
-project with "test label".</small>
-</p>
+ vssserverpath="d:\vss\srcsafe.ini"/></pre>
+<p>Connects to a SourceOffsite server on <samp>192.168.10.6:8888</samp>
+with <q>build</q>, <q>build</q> as the username & password. The SourceSafe database resides on
+the same box as the SOS server & the VSS database is at <samp>d:\vss\srcsafe.ini</samp>. Labels
+the <samp>$/SourceRoot/project1</samp> project with <q>test label</q>.</p>
<hr/>
<h2 id="SOSCheckIn">SOSCheckIn</h2>
<h3>Description</h3>
- Task to perform CheckIn commands with SOS<br>
+<p>Task to perform <var>CheckIn</var> commands with SOS</p>
<h3>Parameters</h3>
-<table>
- <tbody>
+<table class="attr">
+ <thead>
<tr>
<th>Attribute</th>
<th>Values</th>
<th>Required</th>
</tr>
+ </thead>
+ <tbody>
<tr>
<td>soscmd</td>
- <td>Directory which contains soscmd(.exe) <br>
- soscmd(.exe) must be in the path if this is not specified</td>
- <td>No</td>
+ <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>No; by default, the executable must be in the path</td>
</tr>
<tr>
- <td>vssserverpath</td>
- <td>path to the srcsafe.ini - eg. \\server\vss\srcsafe.ini</td>
- <td>Yes</td>
+ <td>vssserverpath</td>
+ <td>path to the <samp>srcsafe.ini</samp>—eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>sosserverpath</td>
- <td>address and port of the SOS server - eg. 192.168.0.1:8888</td>
- <td>Yes</td>
+ <td>sosserverpath</td>
+ <td>address and port of the SOS server—eg. <samp>192.168.0.1:8888</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>projectpath</td>
- <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
- <td>Yes</td>
+ <td>projectpath</td>
+ <td>SourceSafe project path—eg. <samp>$/SourceRoot/Project1</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>file</td>
- <td>Filename to act upon<br> If no file is specified then act upon the project</td>
- <td>No</td>
+ <td>file</td>
+ <td>Filename to act upon</td>
+ <td>No; by default, act upon the project</td>
</tr>
<tr>
- <td>username</td>
- <td>SourceSafe username</td>
- <td>Yes</td>
+ <td>username</td>
+ <td>SourceSafe username</td>
+ <td>Yes</td>
</tr>
<tr>
- <td>password</td>
- <td>SourceSafe password</td>
- <td>No</td>
+ <td>password</td>
+ <td>SourceSafe password</td>
+ <td>No</td>
</tr>
<tr>
- <td>localpath</td>
- <td>Override the working directory and get to the specified path</td>
- <td>No</td>
+ <td>localpath</td>
+ <td>Override the working directory and get to the specified path</td>
+ <td>No</td>
</tr>
<tr>
- <td>soshome</td>
- <td>The path to the SourceOffSite home directory</td>
- <td>No</td>
+ <td>soshome</td>
+ <td>The path to the SourceOffSite home directory</td>
+ <td>No</td>
</tr>
<tr>
- <td>nocompress</td>
- <td>true or false - disable compression</td>
- <td>No</td>
+ <td>nocompress</td>
+ <td><q>true|false</q>—disable compression</td>
+ <td>No</td>
</tr>
<tr>
- <td>recursive</td>
- <td>true or false - Only works with the CheckOutProject command</td>
- <td>No</td>
+ <td>recursive</td>
+ <td><q>true|false</q>—Only works with the <var>CheckOutProject</var> command</td>
+ <td>No</td>
</tr>
<tr>
- <td>nocache</td>
- <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
- <td>No</td>
+ <td>nocache</td>
+ <td><q>true|false</q>—Only needed if <code>SOSHOME</code> is set as an environment
+ variable</td>
+ <td>No</td>
</tr>
<tr>
- <td>verbose</td>
- <td>true or false - Status messages are displayed</td>
- <td>No</td>
+ <td>verbose</td>
+ <td><q>true|false</q>—Status messages are displayed</td>
+ <td>No</td>
</tr>
- <tr><td>comment</td>
- <td>A comment to be applied to all files being checked in</td>
- <td>No</td>
+ <tr>
+ <td>comment</td>
+ <td>A comment to be applied to all files being checked in</td>
+ <td>No</td>
</tr>
- </tbody>
+ </tbody>
</table>
<h3>Example</h3>
@@ -374,102 +364,98 @@ project with "test label".</small>
comment="comment abc"
projectpath="$/SourceRoot/project1"
sosserverpath="server1:8888"
- vssserverpath="\\server2\vss\srcsafe.ini"/>
-</pre>
+ vssserverpath="\\server2\vss\srcsafe.ini"/></pre>
-<p>
-<small>Connects to a SourceOffsite server on server1:8888 with build,build as
-the username & password. The SourceSafe database resides on a different
-box (server2) & the VSS database is on a share called
-"vss". Checks-in only the "foobar.txt" file adding
-a comment of "comment abc". Extra status messages will be
-displayed on screen.</small>
-</p>
+<p>Connects to a SourceOffsite server on <samp>server1:8888</samp> with <q>build</q>, <q>build</q>
+as the username & password. The SourceSafe database resides on a different box
+(<samp>server2</samp>) & the VSS database is on a share called <samp>vss</samp>. Checks-in only
+the <samp>foobar.txt</samp> file adding a comment of <q>comment abc</q>. Extra status messages will
+be displayed on screen.</p>
<hr/>
<h2 id="SOSCheckOut">SOSCheckOut</h2>
<h3>Description</h3>
- Task to perform CheckOut commands with SOS<br>
+<p>Task to perform <var>CheckOut</var> commands with SOS</p>
<h3>Parameters</h3>
-<table>
- <tbody>
+<table class="attr">
+ <thead>
<tr>
<th>Attribute</th>
<th>Values</th>
<th>Required</th>
</tr>
+ </thead>
+ <tbody>
<tr>
<td>soscmd</td>
- <td>Directory which contains soscmd(.exe) <br>
- soscmd(.exe) must be in the path if this is not specified</td>
- <td>No</td>
+ <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>No; by default, the executable must be in the path</td>
</tr>
<tr>
- <td>vssserverpath</td>
- <td>path to the srcsafe.ini - eg. \\server\vss\srcsafe.ini</td>
- <td>Yes</td>
+ <td>vssserverpath</td>
+ <td>path to the <samp>srcsafe.ini</samp>—eg. <samp>\\server\vss\srcsafe.ini</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>sosserverpath</td>
- <td>address and port of the SOS server - eg. 192.168.0.1:8888</td>
- <td>Yes</td>
+ <td>sosserverpath</td>
+ <td>address and port of the SOS server—eg. <samp>192.168.0.1:8888</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>projectpath</td>
- <td>SourceSafe project path - eg. $/SourceRoot/Project1</td>
- <td>Yes</td>
+ <td>projectpath</td>
+ <td>SourceSafe project path—eg. <samp>$/SourceRoot/Project1</samp></td>
+ <td>Yes</td>
</tr>
<tr>
- <td>file</td>
- <td>Filename to act upon<br> If no file is specified then act upon the project</td>
- <td>No</td>
+ <td>file</td>
+ <td>Filename to act upon</td>
+ <td>No; by default, act upon the project</td>
</tr>
<tr>
- <td>username</td>
- <td>SourceSafe username</td>
- <td>Yes</td>
+ <td>username</td>
+ <td>SourceSafe username</td>
+ <td>Yes</td>
</tr>
<tr>
- <td>password</td>
- <td>SourceSafe password</td>
- <td>No</td>
+ <td>password</td>
+ <td>SourceSafe password</td>
+ <td>No</td>
</tr>
<tr>
- <td>localpath</td>
- <td>Override the working directory and get to the specified path</td>
- <td>No</td>
+ <td>localpath</td>
+ <td>Override the working directory and get to the specified path</td>
+ <td>No</td>
</tr>
<tr>
- <td>soshome</td>
- <td>The path to the SourceOffSite home directory</td>
- <td>No</td>
+ <td>soshome</td>
+ <td>The path to the SourceOffSite home directory</td>
+ <td>No</td>
</tr>
<tr>
- <td>nocompress</td>
- <td>true or false - disable compression</td>
- <td>No</td>
+ <td>nocompress</td>
+ <td><q>true|false</q>—disable compression</td>
+ <td>No</td>
</tr>
<tr>
- <td>recursive</td>
- <td>true or false - Only works with the CheckOutProject command</td>
- <td>No</td>
+ <td>recursive</td>
+ <td><q>true|false</q>—Only works with the <var>CheckOutProject</var> command</td>
+ <td>No</td>
</tr>
<tr>
- <td>nocache</td>
- <td>true or false - Only needed if SOSHOME is set as an environment variable</td>
- <td>No</td>
+ <td>nocache</td>
+ <td><q>true|false</q>—Only needed if <code>SOSHOME</code> is set as an environment variable</td>
+ <td>No</td>
</tr>
<tr>
- <td>verbose</td>
- <td>true or false - Status messages are displayed</td>
- <td>No</td>
+ <td>verbose</td>
+ <td><q>true|false</q>—Status messages are displayed</td>
+ <td>No</td>
</tr>
</tbody>
</table>
- <br>
<h3>Example</h3>
<pre>
@@ -479,17 +465,13 @@ displayed on screen.</small>
password="build"
projectpath="$/SourceRoot/project1"
sosserverpath="192.168.10.6:8888"
- vssserverpath="\\server2\vss\srcsafe.ini"/>
-</pre>
-<p>
-<small>Connects to a SourceOffsite server on server1:8888 with build,build as
-the username & password. The SourceSafe database resides on a different
-box (server2) & the VSS database is on a share called
-"vss". Checks-out "project1", Only the
-"project1" directory will be locked as the recursive option
-was not set. Extra status messages will be displayed on screen. The
-soscmd(.exe) file to be used resides in /usr/local/bin.</small>
-</p>
+ vssserverpath="\\server2\vss\srcsafe.ini"/></pre>
+<p>Connects to a SourceOffsite server on <samp>server1:8888</samp> with <q>build</q>, <q>build</q>
+as the username & password. The SourceSafe database resides on a different box
+(<samp>server2</samp>) & the VSS database is on a share
+called <samp>vss</samp>. Checks-out <q>project1</q>, only the <samp>project1</samp> directory will
+be locked as the recursive option was not set. Extra status messages will be displayed on
+screen. The <code>soscmd(.exe)</code> file to be used resides in <samp>/usr/local/bin</samp>.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/66b52f99/manual/Tasks/sound.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html
index 7f8f341..47ecdd8 100644
--- a/manual/Tasks/sound.html
+++ b/manual/Tasks/sound.html
@@ -26,22 +26,17 @@
<h2 id="sound">Sound</h2>
<h3>Description</h3>
-<p>Plays a sound-file at the end of the build, according to whether
-the build failed or succeeded. You can specify either a specific
-sound-file to play, or, if a directory is specified, the
-<code><sound></code> task will randomly select a file to play.
-<strong>Note</strong>: At this point, the random selection is based on all the files
-in the directory, not just those ending in appropriate suffixes
-for sound-files, so be sure you only have sound-files in the
-directory you specify.</p>
-<p>More precisely <code><sound></code> registers a hook that is
-triggered when the build finishes. Therefore you have to place this
-task as top level or inside a target which is always executed.</p>
-<p>
-Unless you are running on Java 1.3 or later, you need the Java Media Framework
-on the classpath (javax.sound).
-</p>
-
+<p>Plays a sound file at the end of the build, according to whether the build failed or
+succeeded. You can specify either a specific sound file to play, or, if a directory is specified,
+the <code><sound></code> task will randomly select a file to play. <strong>Note</strong>: At
+this point, the random selection is based on all the files in the directory, not just those ending
+in appropriate suffixes for sound files, so be sure you only have sound files in the directory you
+specify.</p>
+<p>More precisely <code><sound></code> registers a hook that is triggered when the build
+finishes. Therefore you have to place this task as top level or inside a target which is always
+executed.</p>
+<p>Unless you are running on Java 1.3 or later, you need the Java Media Framework on the classpath
+(<code>javax.sound</code>).</p>
<h3>Nested Elements</h3>
<h4>success</h4>
@@ -50,36 +45,29 @@ on the classpath (javax.sound).
<p>Specifies the sound to be played if the build failed.</p>
<h3>Nested Element Parameters</h3>
-<p>
-The following attributes may be used on the <code><success></code>
+<p>The following attributes may be used on the <code><success></code>
and <code><fail></code> elements:</p>
-<table>
+<table class="attr">
<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>Attribute</th>
+ <th>Description</th>
+ <th>Required</th>
</tr>
<tr>
- <td valign="top">source</td>
- <td valign="top">the path to a sound-file directory, or the name of a
-specific sound-file, to be played. If this file does not exist, an error message
-will be logged.
- </td>
- <td valign="top" align="center">Yes</td>
+ <td>source</td>
+ <td>the path to a sound file directory, or the name of a specific sound file, to be played. If
+ this file does not exist, an error message will be logged.</td>
+ <td>Yes</td>
</tr>
<tr>
- <td valign="top">loops</td>
- <td valign="top">the number of extra times to play the sound-file;
- default is <code>0</code>.
- </td>
- <td valign="top" align="center">No</td>
+ <td>loops</td>
+ <td>the number of extra times to play the sound file.</td>
+ <td>No; default is <code>0</code></td>
</tr>
<tr>
- <td valign="top">duration</td>
- <td valign="top">the amount of time (in milliseconds) to play
- the sound-file.
- </td>
- <td valign="top" align="center">No</td>
+ <td>duration</td>
+ <td>the amount of time (in milliseconds) to play the sound file.</td>
+ <td>No</td>
</tr>
</table>
@@ -92,16 +80,11 @@ will be logged.
<fail source="${user.home}/sounds/ohno.wav" loops="2"/>
</sound>
<property name="fun.done" value="true"/>
-</target>
-</pre>
-plays the <code>bell.wav</code> sound-file if the build succeeded, or
-the <code>ohno.wav</code> sound-file if the build failed, three times,
-if the <code>fun</code> property is set to <code>true</code>.
-If the target
-is a dependency of an "initialization" target that other
-targets depend on, the
-<code>fun.done</code> property prevents the target from being executed
-more than once.
+</target></pre>
+<p>plays the <samp>bell.wav</samp> sound file if the build succeeded, or the <samp>ohno.wav</samp>
+sound file if the build failed, three times, if the <code>fun</code> property is set to <q>true</q>.
+If the target is a dependency of an "initialization" target that other targets depend on,
+the <code>fun.done</code> property prevents the target from being executed more than once.</p>
<pre>
<target name="fun" if="fun" unless="fun.done">
<sound>
@@ -111,7 +94,7 @@ more than once.
<property name="fun.done" value="true"/>
</target>
</pre>
-randomly selects a sound-file to play when the build succeeds or fails.
+<p>randomly selects a sound file to play when the build succeeds or fails.</p>
</body>
</html>