From a6b5875cf16d74f77bd414b1d6a4dcc6bca774df Mon Sep 17 00:00:00 2001 From: remm Date: Fri, 18 Aug 2006 12:57:28 +0000 Subject: [PATCH] - 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 --- RELEASE-NOTES | 38 ++++++++++++++++---------------------- bin/setclasspath.bat | 2 +- bin/setclasspath.sh | 2 +- build.xml | 2 ++ webapps/ROOT/index.html | 12 ++++++------ webapps/ROOT/index.jsp | 4 ++-- 6 files changed, 28 insertions(+), 32 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 348963bc8..6008ee397 100644 --- 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 7cd169004..502085055 100755 --- 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 73311a65a..fcd1623fb 100755 --- 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 56fbc5411..2d6185c43 100644 --- a/build.xml +++ b/build.xml @@ -423,6 +423,8 @@ + +