PR: 37203 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@327676 13f79535-47bb-0310-9956-ffa450edef68master
@@ -1666,7 +1666,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun | |||||
<code>org.apache.tools.ant.taskdefs.XSLTLiaison</code> | <code>org.apache.tools.ant.taskdefs.XSLTLiaison</code> | ||||
class.</p> | class.</p> | ||||
<p>Ant's class loader implementation uses Java's | <p>Ant's class loader implementation uses Java's | ||||
delegation model, see <a href="http://java.sun.com/products/jdk/1.2/docs/api/java/lang/ClassLoader.html">http://java.sun.com/products/jdk/1.2/docs/api/java/lang/ClassLoader.html</a> | |||||
delegation model, see <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/lang/ClassLoader.html">http://java.sun.com/j2se/1.5.0/docs/api/java/lang/ClassLoader.html</a> | |||||
the paragraph</p> | the paragraph</p> | ||||
<blockquote>The <code>ClassLoader</code> class uses a | <blockquote>The <code>ClassLoader</code> class uses a | ||||
delegation model to search for classes and resources. Each | delegation model to search for classes and resources. Each | ||||
@@ -70,8 +70,8 @@ Resource Collection</a>s are used to | |||||
<td valign="top">encoding</td> | <td valign="top">encoding</td> | ||||
<td valign="top"> | <td valign="top"> | ||||
Specifies the encoding for the input files. Please see <a | Specifies the encoding for the input files. Please see <a | ||||
href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"> | |||||
http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a> | |||||
href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html"> | |||||
http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a> | |||||
for a list of possible values. Defaults to the platform's | for a list of possible values. Defaults to the platform's | ||||
default character encoding. | default character encoding. | ||||
</td> | </td> | ||||
@@ -758,7 +758,7 @@ arguments</a>. <em>Since Ant 1.6</em></p> | |||||
<tag name="todo" scope="all" description="To do:"/> | <tag name="todo" scope="all" description="To do:"/> | ||||
<group title="Group 1 Packages" packages="com.dummy.test.a*"/> | <group title="Group 1 Packages" packages="com.dummy.test.a*"/> | ||||
<group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/> | <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/> | ||||
<link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp"/> | |||||
<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/" packagelistLoc="C:\tmp"/> | |||||
<link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/> | <link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/> | ||||
</javadoc></pre> | </javadoc></pre> | ||||
@@ -781,7 +781,7 @@ arguments</a>. <em>Since Ant 1.6</em></p> | |||||
<tag name="todo" scope="all" description="To do:"/> | <tag name="todo" scope="all" description="To do:"/> | ||||
<group title="Group 1 Packages" packages="com.dummy.test.a*"/> | <group title="Group 1 Packages" packages="com.dummy.test.a*"/> | ||||
<group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/> | <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/> | ||||
<link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp"/> | |||||
<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/" packagelistLoc="C:\tmp"/> | |||||
<link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/> | <link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/> | ||||
</javadoc></pre> | </javadoc></pre> | ||||
@@ -804,7 +804,7 @@ arguments</a>. <em>Since Ant 1.6</em></p> | |||||
<tag name="todo" scope="all" description="To do:"/> | <tag name="todo" scope="all" description="To do:"/> | ||||
<group title="Group 1 Packages" packages="com.dummy.test.a*"/> | <group title="Group 1 Packages" packages="com.dummy.test.a*"/> | ||||
<group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/> | <group title="Group 2 Packages" packages="com.dummy.test.b*:com.dummy.test.c*"/> | ||||
<link offline="true" href="http://java.sun.com/products/jdk/1.2/docs/api/" packagelistLoc="C:\tmp"/> | |||||
<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/" packagelistLoc="C:\tmp"/> | |||||
<link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/> | <link href="http://developer.java.sun.com/developer/products/xml/docs/api/"/> | ||||
</javadoc></pre> | </javadoc></pre> | ||||
@@ -58,7 +58,7 @@ line.</p> | |||||
</table> | </table> | ||||
<h3>Nested elements</h3> | <h3>Nested elements</h3> | ||||
<h4><a name="attribute">attribute</h4></h4> | |||||
<h4><a name="attribute">attribute</a></h4> | |||||
<p>One attribute for the manifest file. Those attributes that are | <p>One attribute for the manifest file. Those attributes that are | ||||
not nested into a section will be added to the "Main" section.</p> | not nested into a section will be added to the "Main" section.</p> | ||||
<table border="1" cellpadding="2" cellspacing="0"> | <table border="1" cellpadding="2" cellspacing="0"> | ||||
@@ -121,7 +121,7 @@ href="#attribute">attribute</a> elements into sections.</p> | |||||
attribute will take the value of the Ant property ${user.name}. The | attribute will take the value of the Ant property ${user.name}. The | ||||
same is true for the ${version} and ${TODAY} properties. This example | same is true for the ${version} and ${TODAY} properties. This example | ||||
produces a MANIFEST.MF that contains | produces a MANIFEST.MF that contains | ||||
<a href="http://java.sun.com/products/jdk/1.2/docs/guide/versioning/index.html">package | |||||
<a href="http://java.sun.com/j2se/1.5.0/docs/guide/versioning/">package | |||||
version identification</a> for the package <code>common</code>.</p> | version identification</a> for the package <code>common</code>.</p> | ||||
<p>The manifest produced by the above would look like this:</p> | <p>The manifest produced by the above would look like this:</p> | ||||
@@ -69,7 +69,7 @@ nested element.</p> | |||||
the <code>untar</code> task.<br> | the <code>untar</code> task.<br> | ||||
The character encoding that has been used for filenames | The character encoding that has been used for filenames | ||||
inside the zip file. For a list of possible values see <a | inside the zip file. For a list of possible values see <a | ||||
href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>.<br> | |||||
href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.<br> | |||||
Defaults to "UTF8", use the magic value | Defaults to "UTF8", use the magic value | ||||
<code>native-encoding</code> for the platform's default character | <code>native-encoding</code> for the platform's default character | ||||
encoding.</td> | encoding.</td> | ||||
@@ -84,7 +84,7 @@ public class AntStructure extends Task { | |||||
} catch (UnsupportedEncodingException ue) { | } catch (UnsupportedEncodingException ue) { | ||||
/* | /* | ||||
* Plain impossible with UTF8, see | * Plain impossible with UTF8, see | ||||
* http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html | |||||
* http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html | |||||
* | * | ||||
* fallback to platform specific anyway. | * fallback to platform specific anyway. | ||||
*/ | */ | ||||
@@ -68,8 +68,8 @@ public class LoadFile extends Task { | |||||
* encoding. <p> | * encoding. <p> | ||||
* | * | ||||
* For a list of possible values see | * For a list of possible values see | ||||
* <a href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"> | |||||
* http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html | |||||
* <a href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html"> | |||||
* http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html | |||||
* </a>.</p> | * </a>.</p> | ||||
* | * | ||||
* @param encoding The new Encoding value | * @param encoding The new Encoding value | ||||
@@ -90,8 +90,8 @@ public class LoadProperties extends Task { | |||||
* encoding. <p> | * encoding. <p> | ||||
* | * | ||||
* For a list of possible values see | * For a list of possible values see | ||||
* <a href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html"> | |||||
* http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html | |||||
* <a href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html"> | |||||
* http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html | |||||
* </a>.</p> | * </a>.</p> | ||||
* | * | ||||
* @param encoding The new Encoding value | * @param encoding The new Encoding value | ||||
@@ -291,7 +291,7 @@ public class Zip extends MatchingTask { | |||||
* default encoding. | * default encoding. | ||||
* | * | ||||
* <p>For a list of possible values see <a | * <p>For a list of possible values see <a | ||||
* href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>.</p> | |||||
* href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>.</p> | |||||
* @param encoding the encoding name | * @param encoding the encoding name | ||||
*/ | */ | ||||
public void setEncoding(String encoding) { | public void setEncoding(String encoding) { | ||||
@@ -79,7 +79,7 @@ public class ZipFile { | |||||
* The encoding to use for filenames and the file comment. | * The encoding to use for filenames and the file comment. | ||||
* | * | ||||
* <p>For a list of possible values see <a | * <p>For a list of possible values see <a | ||||
* href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>. | |||||
* href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>. | |||||
* Defaults to the platform's default character encoding.</p> | * Defaults to the platform's default character encoding.</p> | ||||
*/ | */ | ||||
private String encoding = null; | private String encoding = null; | ||||
@@ -185,7 +185,7 @@ public class ZipOutputStream extends FilterOutputStream { | |||||
* The encoding to use for filenames and the file comment. | * The encoding to use for filenames and the file comment. | ||||
* | * | ||||
* <p>For a list of possible values see <a | * <p>For a list of possible values see <a | ||||
* href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>. | |||||
* href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>. | |||||
* Defaults to the platform's default character encoding.</p> | * Defaults to the platform's default character encoding.</p> | ||||
* | * | ||||
* @since 1.3 | * @since 1.3 | ||||
@@ -276,7 +276,7 @@ public class ZipOutputStream extends FilterOutputStream { | |||||
* The encoding to use for filenames and the file comment. | * The encoding to use for filenames and the file comment. | ||||
* | * | ||||
* <p>For a list of possible values see <a | * <p>For a list of possible values see <a | ||||
* href="http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html">http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html</a>. | |||||
* href="http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html">http://java.sun.com/j2se/1.5.0/docs/guide/intl/encoding.doc.html</a>. | |||||
* Defaults to the platform's default character encoding.</p> | * Defaults to the platform's default character encoding.</p> | ||||
* @param encoding the encoding value | * @param encoding the encoding value | ||||
* @since 1.3 | * @since 1.3 | ||||