From 48c17e6a1aa273351aa378fdaa362b2a409c8731 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 14 Jan 2009 19:46:32 +0000 Subject: [PATCH] Use a snapshot of DBCP source that includes the JDK 1.6 fixes. Remove the DBCP 1.5 hack Update Tomcat and Servlet version numbers Update year to 2009 Force 1.6 compile since Servlet 3.0 requires it git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@734491 13f79535-47bb-0310-9956-ffa450edef68 --- BUILDING.txt | 8 ++++---- NOTICE | 2 +- RELEASE-NOTES | 4 ++-- RUNNING.txt | 12 ++++++------ build.properties.default | 4 ++-- build.xml | 50 ++++++++++++------------------------------------ dist.xml | 14 +++++++------- extras.xml | 10 +++++----- 8 files changed, 39 insertions(+), 65 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index d7aaa42da..75960aa85 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -22,7 +22,7 @@ $Id$ ==================================================== This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a container that -implements the Servlet 2.5 and JSP 2.1 specifications from the Java +implements the Servlet 3.0 and JSP 2.1 specifications from the Java Community Process . In order to build a binary distribution version of the container from a source distribution, do the following: @@ -32,7 +32,7 @@ do the following: * If the JDK is already installed, skip to (1). -* Download a Java Development Kit (JDK) release (version 1.5.x or later) from: +* Download a Java Development Kit (JDK) release (version 1.6.x or later) from: http://java.sun.com/j2se/ @@ -72,7 +72,7 @@ do the following: http://svn.apache.org/repos/asf/tomcat/tc@VERSION_MAJOR_MINOR@.x/ * Download a source package from: - http://tomcat.apache.org/download-60.cgi + http://tomcat.apache.org/download-70.cgi * Checkout the source using SVN, selecting the desired version or branch (current development source is at @@ -113,7 +113,7 @@ do the following: (3) Updating sources -It is recommended that you regularly update the downloaded Tomcat 6 sources +It is recommended that you regularly update the downloaded Tomcat 7 sources using your SVN client. (4) Rebuilds diff --git a/NOTICE b/NOTICE index b98880cb4..5a239112c 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2007 The Apache Software Foundation +Copyright 1999-2009 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 7b11ef55d..389e9a5a4 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -41,7 +41,7 @@ KNOWN ISSUES IN THIS RELEASE: =================== Dependency Changes: =================== -Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 5.0 and later. +Tomcat @VERSION_MAJOR_MINOR@ is designed to run on JSE 6.0 and later. In addition, Tomcat @VERSION_MAJOR_MINOR@ uses the Eclipse JDT Java compiler for compiling JSP pages. This means you no longer need to have the complete @@ -88,7 +88,7 @@ for use by web applications (by placing them in "lib"): * jasper-el.jar (Jasper 2 EL implementation) * jasper-jdt.jar (Eclipse JDT 3.3 Java compiler) * jsp-api.jar (JSP 2.1 API) -* servlet-api.jar (Servlet 2.5 API) +* servlet-api.jar (Servlet 3.0 API) * tomcat-coyote.jar (Tomcat connectors and utility classes) * tomcat-dbcp.jar (package renamed database connection pool based on Commons DBCP) diff --git a/RUNNING.txt b/RUNNING.txt index 6c1f543bb..b792aabcd 100644 --- a/RUNNING.txt +++ b/RUNNING.txt @@ -22,27 +22,27 @@ $Id$ =================================================== Apache Tomcat @VERSION_MAJOR_MINOR@ requires the Java 2 Standard Edition Runtime -Environment (JRE) version 5.0 or later. +Environment (JRE) version 6.0 or later. ============================= -Running With JRE 5.0 Or Later +Running With JRE 6.0 Or Later ============================= (1) Download and Install the J2SE Runtime Environment (JRE) (1.1) Download the Java 2 Standard Edition Runtime Environment (JRE), - release version 5.0 or later, from http://java.sun.com/j2se. + release version 6.0 or later, from http://java.sun.com/j2se. (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:\jre5.0 - or /usr/local/java/jre5.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:\j2sdk5.0 - or /usr/local/java/j2sdk5.0. + the directory into which you installed the JDK, e.g. c:\j2sdk6.0 + or /usr/local/java/j2sdk6.0. (2) Download and Install the Tomcat Binary Distribution diff --git a/build.properties.default b/build.properties.default index 9090ce2c3..7937d46db 100644 --- a/build.properties.default +++ b/build.properties.default @@ -70,8 +70,8 @@ tomcat-native.dll=${base-tomcat.loc}/tomcat-connectors/native/${tomcat-native.ve # ----- Commons DBCP, version 1.1 or later ----- commons-dbcp.version=1.2.2 -commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src -commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz +commons-dbcp.home=${base.path}/commons-dbcp-r734404-src +commons-dbcp-src.loc=http://people.apache.org/~markt/dev/commons-dbcp-r734404-src.tar.gz # ----- Commons Pool, version 1.1 or later ----- commons-pool.home=${base.path}/commons-pool-1.4-src diff --git a/build.xml b/build.xml index 5d73ce8a4..868f9b902 100644 --- a/build.xml +++ b/build.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -30,8 +30,8 @@ - - + + @@ -51,13 +51,11 @@ - - - - + + - + @@ -82,8 +80,6 @@ - - @@ -270,7 +266,7 @@ - + - - WARNING: tomcat-dbcp.jar not included, this build can't be used - in a release. Please run 'ant download' with JDK1.5 if you are - building a tomcat release. - - - + @@ -742,16 +732,8 @@ - + - @@ -759,16 +741,9 @@ + - @@ -783,13 +758,12 @@ - diff --git a/dist.xml b/dist.xml index 8a8dfeced..64923c71f 100644 --- a/dist.xml +++ b/dist.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -30,8 +30,8 @@ - - + + @@ -57,8 +57,8 @@ - - + + @@ -271,7 +271,7 @@ author="true" version="true" windowtitle="Tomcat API Documentation" doctitle="Tomcat API" - bottom="Copyright © 2000-2008 Apache Software Foundation. All Rights Reserved." + bottom="Copyright © 2000-${year} Apache Software Foundation. All Rights Reserved." additionalparam="-breakiterator" maxmemory="256m" > @@ -384,7 +384,7 @@ + description="Create a Tomcat 7 packaged distribution"> diff --git a/extras.xml b/extras.xml index 783907a8e..179eb65c3 100644 --- a/extras.xml +++ b/extras.xml @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -30,8 +30,8 @@ - - + + @@ -54,8 +54,8 @@ - - + + -- 2.11.0