- Fix links.

- Endorsed folder is now "endorsed".

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@432565 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 348963b..6008ee3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -27,11 +27,10 @@ KNOWN ISSUES IN THIS RELEASE:
 ===================
 Dependency Changes:
 ===================
-Tomcat 5.5 is designed to run on J2SE 5.0 and later, and requires
-configuration to run on J2SE 1.4.  Make sure to read the "RUNNING.txt" 
-file in the fulldocs downloadable file(s) if you are using J2SE 1.4.
+Tomcat 6.0 is designed to run on JSE 5.0 and later, and requires
+configuration to run on JSE 5.0.
 
-In addition, Tomcat 5.5 uses the Eclipse JDT Java compiler for compiling
+In addition, Tomcat 6.0 uses the Eclipse JDT Java compiler for compiling
 JSP pages.  This means you no longer need to have the complete
 Java Development Kit (JDK) to run Tomcat, but a Java Runtime Environment
 (JRE) is sufficient.  The Eclipse JDT Java compiler is bundled with the 
@@ -64,24 +63,19 @@ during the lifetime of a particular JVM.
 =============
 Bundled APIs:
 =============
-A standard installation of Tomcat 5.5 makes all of the following APIs available
-for use by web applications (by placing them in "common/lib" or "shared/lib"):
-* commons-el.jar (Commons Expression Language 1.0)
+A standard installation of Tomcat 6.0 makes all of the following APIs available
+for use by web applications (by placing them in "lib"):
+* catalina.jar (Tomcat Catalina implementation)
+* catalina-ant.jar (Tomcat Catalina Ant tasks)
 * commons-logging-api.jar (Commons Logging API 1.0.x)
-* jasper-compiler.jar (Jasper 2 Compiler)
-* jasper-compiler-jdt.jar (Eclipse JDT Java compiler)
-* jasper-runtime.jar (Jasper 2 Runtime)
-* jsp-api.jar (JSP 2.0 API)
-* naming-common.jar (JNDI Context implementation)
-* naming-factory.jar (JNDI object factories for J2EE ENC support)
-* naming-factory-dbcp.jar (DataSource implementation based on commons-dbcp)
-* naming-resources.jar (JNDI DirContext implementations)
-* servlet-api.jar (Servlet 2.4 API)
-
-Installing the compatibility package will add the following to the list, which are
-needed when running on J2SE 1.4:
-* jmx.jar (Java Management Extensions API 1.2 or later)
-* xercesImpl.jar (Xerces XML Parser, version 2.6.2 or later)
+* el-api.jar (EL 1.0 API)
+* jasper.jar (Jasper 2 Compiler and Runtime)
+* jasper-compiler-jdt.jar (Eclipse JDT 3.2 Java compiler)
+* jasper-el.jar (Jasper 2 EL implementation)
+* jsp-api.jar (JSP 2.1 API)
+* servlet-api.jar (Servlet 2.5 API)
+* tomcat-coyote.jar (Tomcat connectors and utility classes)
+* tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP)
 
 You can make additional APIs available to all of your web applications by
 putting unpacked classes into a "classes" directory (not created by default),
@@ -89,7 +83,7 @@ or by placing them in JAR files in the "lib" directory.
 
 To override the XML parser implementation or interfaces, use the endorsed
 mechanism of the JVM. The default configuration defines JARs located in 
-"common/endorsed" as endorsed.
+"endorsed" as endorsed.
 
 
 ================================================================

diff --git a/bin/setclasspath.bat b/bin/setclasspath.bat
index 7cd1690..5020850 100755 (executable)
--- a/bin/setclasspath.bat
+++ b/bin/setclasspath.bat
@@ -46,7 +46,7 @@ goto exit
 :okBasedir
 
 rem Set the default -Djava.endorsed.dirs argument
-set JAVA_ENDORSED_DIRS=%BASEDIR%\common\endorsed
+set JAVA_ENDORSED_DIRS=%BASEDIR%\endorsed
 
 rem Set standard CLASSPATH
 rem Note that there are no quotes as we do not want to introduce random

diff --git a/bin/setclasspath.sh b/bin/setclasspath.sh
index 73311a6..fcd1623 100755 (executable)
--- a/bin/setclasspath.sh
+++ b/bin/setclasspath.sh
@@ -65,7 +65,7 @@ if [ ! -x "$BASEDIR"/bin/setclasspath.sh ]; then
 fi
 
 # Set the default -Djava.endorsed.dirs argument
-JAVA_ENDORSED_DIRS="$BASEDIR"/common/endorsed
+JAVA_ENDORSED_DIRS="$BASEDIR"/endorsed
 
 # Set standard CLASSPATH
 if [ "$1" = "debug" -o "$1" = "javac" ] ; then

diff --git a/build.xml b/build.xml
index 56fbc54..2d6185c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -423,6 +423,8 @@
       </fileset>
     </copy>
 
+    <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt" file="RELEASE-NOTES" />
+
     <!-- Build classes for examples webapp -->
     <javac   srcdir="webapps/examples/WEB-INF/classes" 
              destdir="${tomcat.build}/webapps/examples/WEB-INF/classes"

diff --git a/webapps/ROOT/index.html b/webapps/ROOT/index.html
index 503d9b6..029faef 100644 (file)
--- a/webapps/ROOT/index.html
+++ b/webapps/ROOT/index.html
@@ -74,13 +74,13 @@
 <table id="banner" width="100%">
     <tr>
       <td align="left" style="width:130px">
-        <a href="http://tomcat.apache.org/">
-         <img src="tomcat.gif" height="92" width="130" alt="The Mighty Tomcat - MEOW!"/>
-       </a>
+      <a href="http://tomcat.apache.org/">
+        <img src="tomcat.gif" height="92" width="130" alt="The Mighty Tomcat - MEOW!"/>
+      </a>
       </td>
       <td align="left" valign="top"><b>Apache Tomcat</b></td>
       <td align="right">
-        <a href="http://jakarta.apache.org/">
+        <a href="http://www.apache.org/">
          <img src="asf-logo-wide.gif" height="51" width="537" alt="The Apache Software Foundation"/>
        </a>
        </td>
@@ -114,8 +114,8 @@
                 <tr>
                   <td class="menu">
                     <a href="RELEASE-NOTES.txt">Release&nbsp;Notes</a><br/>
-                    <a href="tomcat-docs/changelog.html">Change&nbsp;Log</a><br/>
-                    <a href="tomcat-docs">Tomcat&nbsp;Documentation</a><br/>                        &nbsp;
+                    <a href="docs/changelog.html">Change&nbsp;Log</a><br/>
+                    <a href="docs">Tomcat&nbsp;Documentation</a><br/>                        &nbsp;
                     &nbsp;
                    </td>
                 </tr>

diff --git a/webapps/ROOT/index.jsp b/webapps/ROOT/index.jsp
index a52c66f..0f6fa61 100644 (file)
--- a/webapps/ROOT/index.jsp
+++ b/webapps/ROOT/index.jsp
@@ -115,8 +115,8 @@
                 <tr>
                   <td class="menu">
                     <a href="RELEASE-NOTES.txt">Release&nbsp;Notes</a><br/>
-                    <a href="tomcat-docs/changelog.html">Change&nbsp;Log</a><br/>
-                    <a href="tomcat-docs">Tomcat&nbsp;Documentation</a><br/>                        &nbsp;
+                    <a href="docs/changelog.html">Change&nbsp;Log</a><br/>
+                    <a href="docs">Tomcat&nbsp;Documentation</a><br/>                        &nbsp;
                     &nbsp;
                    </td>
                 </tr>