From 1544a3c81534471e67d9fe49a77d2b005c126570 Mon Sep 17 00:00:00 2001 From: rjung Date: Thu, 26 Aug 2010 15:07:54 +0000 Subject: [PATCH] BZ49828: Remove deprecated J2SE/J2EE terminology and replace links to Sun with links to Oracle (for those Oracle links that look static). git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@989742 13f79535-47bb-0310-9956-ffa450edef68 --- BUILDING.txt | 4 ++-- RUNNING.txt | 14 ++++++++------ build.xml | 2 +- java/org/apache/catalina/servlets/CGIServlet.java | 6 ++---- .../org/apache/catalina/util/ExtensionValidator.java | 4 ++-- .../org/apache/tomcat/util/net/SocketProperties.java | 6 +++--- res/jvm.ini | 2 +- webapps/docs/appdev/installation.xml | 2 +- webapps/docs/appdev/introduction.xml | 4 ++-- webapps/docs/building.xml | 3 ++- webapps/docs/class-loader-howto.xml | 4 ++-- webapps/docs/config/ajp.xml | 6 +++--- webapps/docs/config/cluster-receiver.xml | 2 +- webapps/docs/config/cluster-sender.xml | 2 +- webapps/docs/config/http.xml | 6 +++--- webapps/docs/config/realm.xml | 2 +- webapps/docs/jndi-resources-howto.xml | 20 ++++++++++---------- webapps/docs/monitoring.xml | 4 ++-- webapps/docs/realm-howto.xml | 8 ++++---- webapps/docs/security-manager-howto.xml | 2 +- webapps/docs/setup.xml | 2 +- 21 files changed, 53 insertions(+), 52 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index d5989c685..6b5eb3026 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -34,7 +34,7 @@ do the following: * Download a Java Development Kit (JDK) release (version 1.6.x or later) from: - http://java.sun.com/j2se/ + http://www.oracle.com/technetwork/java/javase/downloads/index.html * Install the JDK according to the instructions included with the release. @@ -118,7 +118,7 @@ using your SVN client. (4) Rebuilds For a quick rebuild of only modified code you can use: - + cd ${tomcat.source} ant diff --git a/RUNNING.txt b/RUNNING.txt index 3e7a476b3..f25b78664 100644 --- a/RUNNING.txt +++ b/RUNNING.txt @@ -21,28 +21,30 @@ $Id$ Running The Apache Tomcat @VERSION_MAJOR_MINOR@ Servlet/JSP Container =================================================== -Apache Tomcat @VERSION_MAJOR_MINOR@ requires the Java 2 Standard Edition Runtime +Apache Tomcat @VERSION_MAJOR_MINOR@ requires the Java Standard Edition Runtime Environment (JRE) version 6.0 or later. ============================= Running With JRE 6.0 Or Later ============================= -(1) Download and Install the J2SE Runtime Environment (JRE) +(1) Download and Install the Java SE Runtime Environment (JRE) -(1.1) Download the Java 2 Standard Edition Runtime Environment (JRE), - release version 6.0 or later, from http://java.sun.com/j2se. +(1.1) Download the Java SE Runtime Environment (JRE), + release version 6.0 or later, from + http://www.oracle.com/technetwork/java/javase/downloads/index.html (1.2) Install the JRE according to the instructions included with the release. + (1.3) Set an environment variable named JRE_HOME to the pathname of the directory into which you installed the JRE, e.g. c:\jre6.0 or /usr/local/java/jre6.0. NOTE: You may also use the full JDK rather than just the JRE. In this case set your JAVA_HOME environment variable to the pathname of - the directory into which you installed the JDK, e.g. c:\j2sdk6.0 - or /usr/local/java/j2sdk6.0. + the directory into which you installed the JDK, e.g. c:\jdk6.0 + or /usr/local/java/jdk6.0. (2) Download and Install the Tomcat Binary Distribution diff --git a/build.xml b/build.xml index 1a1e9da6b..facc3c41a 100644 --- a/build.xml +++ b/build.xml @@ -1449,7 +1449,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - + diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java index a062c5db0..959862ce6 100644 --- a/java/org/apache/catalina/servlets/CGIServlet.java +++ b/java/org/apache/catalina/servlets/CGIServlet.java @@ -1591,8 +1591,7 @@ public final class CGIServlet extends HttpServlet { } /* original content/structure of this section taken from - * http://developer.java.sun.com/developer/ - * bugParade/bugs/4216884.html + * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4216884 * with major modifications by Martin Dengler */ Runtime rt = null; @@ -1648,8 +1647,7 @@ public final class CGIServlet extends HttpServlet { /* we want to wait for the process to exit, Process.waitFor() * is useless in our situation; see - * http://developer.java.sun.com/developer/ - * bugParade/bugs/4223650.html + * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4223650 */ boolean isRunning = true; diff --git a/java/org/apache/catalina/util/ExtensionValidator.java b/java/org/apache/catalina/util/ExtensionValidator.java index e5c59d466..68546f728 100644 --- a/java/org/apache/catalina/util/ExtensionValidator.java +++ b/java/org/apache/catalina/util/ExtensionValidator.java @@ -45,8 +45,8 @@ import org.apache.tomcat.util.res.StringManager; * are met. This class builds a master list of extensions available to an * application and then validates those extensions. * - * See http://java.sun.com/j2se/1.4/docs/guide/extensions/spec.html for - * a detailed explanation of the extension mechanism in Java. + * See http://download.oracle.com/javase/1.4.2/docs/guide/extensions/spec.html + * for a detailed explanation of the extension mechanism in Java. * * @author Greg Murray * @author Justyna Horwat diff --git a/java/org/apache/tomcat/util/net/SocketProperties.java b/java/org/apache/tomcat/util/net/SocketProperties.java index 37f115855..826248d34 100644 --- a/java/org/apache/tomcat/util/net/SocketProperties.java +++ b/java/org/apache/tomcat/util/net/SocketProperties.java @@ -150,7 +150,7 @@ public class SocketProperties { /** * Performance preferences according to - * http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int) + * http://download.oracle.com/javase/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int) * All three performance attributes must be set or the JVM defaults will be * used. */ @@ -158,7 +158,7 @@ public class SocketProperties { /** * Performance preferences according to - * http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int) + * http://download.oracle.com/javase/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int) * All three performance attributes must be set or the JVM defaults will be * used. */ @@ -166,7 +166,7 @@ public class SocketProperties { /** * Performance preferences according to - * http://java.sun.com/j2se/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int) + * http://download.oracle.com/javase/1.5.0/docs/api/java/net/Socket.html#setPerformancePreferences(int,%20int,%20int) * All three performance attributes must be set or the JVM defaults will be * used. */ diff --git a/res/jvm.ini b/res/jvm.ini index 4e180fcc5..dc3b6e550 100644 --- a/res/jvm.ini +++ b/res/jvm.ini @@ -18,7 +18,7 @@ NumFields=2 [Field 1] Type=Label -Text=Please select the path of a J2SE 6.0 or later JRE installed on your system. Note that if you have a 64-bit operating system, you must specify a 64-bit JRE: +Text=Please select the path of a Java SE 6.0 or later JRE installed on your system. Note that if you have a 64-bit operating system, you must specify a 64-bit JRE: left=0 right=300 top=5 diff --git a/webapps/docs/appdev/installation.xml b/webapps/docs/appdev/installation.xml index 15dc89efd..206745cae 100644 --- a/webapps/docs/appdev/installation.xml +++ b/webapps/docs/appdev/installation.xml @@ -44,7 +44,7 @@ in the following subsections.

Compatible JDKs for many platforms (or links to where they can be found) are available at -http://java.sun.com/j2se/.

+http://www.oracle.com/technetwork/java/javase/downloads/index.html/.

diff --git a/webapps/docs/appdev/introduction.xml b/webapps/docs/appdev/introduction.xml index b71e7a294..0048d6147 100644 --- a/webapps/docs/appdev/introduction.xml +++ b/webapps/docs/appdev/introduction.xml @@ -62,7 +62,7 @@ the details of your particular environment.

information, documentation, and software that is useful in developing web applications with Tomcat.