From 32f2e37a95c6a4e4f1fa7972d4040dbc2c3c9b3d Mon Sep 17 00:00:00 2001 From: Stephane Bailliez Date: Sat, 22 Oct 2005 17:58:42 +0000 Subject: [PATCH] JDK 1.2 is EOL and documentation is no more available. Point to JDK 5 API PR: 37203 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@327676 13f79535-47bb-0310-9956-ffa450edef68 --- docs/faq.html | 2 +- docs/manual/CoreTasks/concat.html | 4 ++-- docs/manual/CoreTasks/javadoc.html | 6 +++--- docs/manual/CoreTasks/manifest.html | 4 ++-- docs/manual/CoreTasks/unzip.html | 2 +- src/main/org/apache/tools/ant/taskdefs/AntStructure.java | 2 +- src/main/org/apache/tools/ant/taskdefs/LoadFile.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/LoadProperties.java | 4 ++-- src/main/org/apache/tools/ant/taskdefs/Zip.java | 2 +- src/main/org/apache/tools/zip/ZipFile.java | 2 +- src/main/org/apache/tools/zip/ZipOutputStream.java | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/faq.html b/docs/faq.html index 53dcac64e..857615bfb 100644 --- a/docs/faq.html +++ b/docs/faq.html @@ -1666,7 +1666,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun org.apache.tools.ant.taskdefs.XSLTLiaison class.

Ant's class loader implementation uses Java's - delegation model, see http://java.sun.com/products/jdk/1.2/docs/api/java/lang/ClassLoader.html + delegation model, see http://java.sun.com/j2se/1.5.0/docs/api/java/lang/ClassLoader.html the paragraph

The ClassLoader class uses a delegation model to search for classes and resources. Each diff --git a/docs/manual/CoreTasks/concat.html b/docs/manual/CoreTasks/concat.html index ac0ae8001..41f3f5981 100644 --- a/docs/manual/CoreTasks/concat.html +++ b/docs/manual/CoreTasks/concat.html @@ -70,8 +70,8 @@ Resource Collections are used to encoding Specifies the encoding for the input files. Please see - http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html + 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 for a list of possible values. Defaults to the platform's default character encoding. diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html index 0f22df449..704a46494 100644 --- a/docs/manual/CoreTasks/javadoc.html +++ b/docs/manual/CoreTasks/javadoc.html @@ -758,7 +758,7 @@ arguments. Since Ant 1.6

<tag name="todo" scope="all" description="To do:"/> <group title="Group 1 Packages" packages="com.dummy.test.a*"/> <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/"/> </javadoc> @@ -781,7 +781,7 @@ arguments. Since Ant 1.6

<tag name="todo" scope="all" description="To do:"/> <group title="Group 1 Packages" packages="com.dummy.test.a*"/> <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/"/> </javadoc> @@ -804,7 +804,7 @@ arguments. Since Ant 1.6

<tag name="todo" scope="all" description="To do:"/> <group title="Group 1 Packages" packages="com.dummy.test.a*"/> <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/"/> </javadoc> diff --git a/docs/manual/CoreTasks/manifest.html b/docs/manual/CoreTasks/manifest.html index cd122fd73..538ec0142 100644 --- a/docs/manual/CoreTasks/manifest.html +++ b/docs/manual/CoreTasks/manifest.html @@ -58,7 +58,7 @@ line.

Nested elements

-

attribute

+

attribute

One attribute for the manifest file. Those attributes that are not nested into a section will be added to the "Main" section.

@@ -121,7 +121,7 @@ href="#attribute">attribute elements into sections.

attribute will take the value of the Ant property ${user.name}. The same is true for the ${version} and ${TODAY} properties. This example produces a MANIFEST.MF that contains -package +package version identification for the package common.

The manifest produced by the above would look like this:

diff --git a/docs/manual/CoreTasks/unzip.html b/docs/manual/CoreTasks/unzip.html index 8a8ce8173..24bd85e90 100644 --- a/docs/manual/CoreTasks/unzip.html +++ b/docs/manual/CoreTasks/unzip.html @@ -69,7 +69,7 @@ nested element.

the untar task.
The character encoding that has been used for filenames inside the zip file. For a list of possible values see http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html.
+ 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.
Defaults to "UTF8", use the magic value native-encoding for the platform's default character encoding. diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java index 770a9c5eb..c06a20d80 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java +++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java @@ -84,7 +84,7 @@ public class AntStructure extends Task { } catch (UnsupportedEncodingException ue) { /* * 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. */ diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java index e44066f81..97a6c33a2 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadFile.java @@ -68,8 +68,8 @@ public class LoadFile extends Task { * encoding.

* * For a list of possible values 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 * .

* * @param encoding The new Encoding value diff --git a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java index 03e0edcd7..cc7a24c4d 100644 --- a/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java +++ b/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java @@ -90,8 +90,8 @@ public class LoadProperties extends Task { * encoding.

* * For a list of possible values 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 * .

* * @param encoding The new Encoding value diff --git a/src/main/org/apache/tools/ant/taskdefs/Zip.java b/src/main/org/apache/tools/ant/taskdefs/Zip.java index 5b4d98ef4..155ee67c8 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Zip.java +++ b/src/main/org/apache/tools/ant/taskdefs/Zip.java @@ -291,7 +291,7 @@ public class Zip extends MatchingTask { * default encoding. * *

For a list of possible values see http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html.

+ * 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.

* @param encoding the encoding name */ public void setEncoding(String encoding) { diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java index 5605dfc19..a6a2ab8f2 100644 --- a/src/main/org/apache/tools/zip/ZipFile.java +++ b/src/main/org/apache/tools/zip/ZipFile.java @@ -79,7 +79,7 @@ public class ZipFile { * The encoding to use for filenames and the file comment. * *

For a list of possible values see http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html. + * 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. * Defaults to the platform's default character encoding.

*/ private String encoding = null; diff --git a/src/main/org/apache/tools/zip/ZipOutputStream.java b/src/main/org/apache/tools/zip/ZipOutputStream.java index b19bd7ba9..44c8a4d05 100644 --- a/src/main/org/apache/tools/zip/ZipOutputStream.java +++ b/src/main/org/apache/tools/zip/ZipOutputStream.java @@ -185,7 +185,7 @@ public class ZipOutputStream extends FilterOutputStream { * The encoding to use for filenames and the file comment. * *

For a list of possible values see http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html. + * 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. * Defaults to the platform's default character encoding.

* * @since 1.3 @@ -276,7 +276,7 @@ public class ZipOutputStream extends FilterOutputStream { * The encoding to use for filenames and the file comment. * *

For a list of possible values see http://java.sun.com/products/jdk/1.2/docs/guide/internat/encoding.doc.html. + * 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. * Defaults to the platform's default character encoding.

* @param encoding the encoding value * @since 1.3