====================================================
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 <http://www.jcp.org/>. In order to build a binary
distribution version of the container from a source distribution,
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/
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
(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
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/).
===================
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
* 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)
===================================================
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
# ----- 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
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Tomcat 6.0" default="deploy" basedir=".">
+<project name="Tomcat 7.0" default="deploy" basedir=".">
<!-- ===================== Initialize Property Values =================== -->
<!-- Project Properties -->
<property name="project" value="apache-tomcat" />
<property name="name" value="Apache Tomcat" />
- <property name="year" value="2008" />
- <property name="version.major" value="6" />
+ <property name="year" value="2009" />
+ <property name="version.major" value="7" />
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
- <!-- Can't be lower - jsp uses templates -->
- <property name="compile.source" value="1.5"/>
- <!-- Can't be higher - must run on 1.5 -->
- <property name="compile.target" value="1.5"/>
+ <property name="compile.source" value="1.6"/>
+ <property name="compile.target" value="1.6"/>
<!-- Exact spec versions (for the manifests) -->
- <property name="servlet.revision" value="MR2" />
+ <property name="servlet.revision" value="PR" />
<property name="jsp.revision" value="FR" />
<!-- JAR artifacts -->
<property name="jasper-jdt.home" value="${base.path}/tomcat${version.major}-deps/jdt" />
<property name="tomcat-dbcp.jar" value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
- <available property="tomcat-dbcp.present" file="${tomcat-dbcp.jar}" />
- <available property="jdk16.present" classname="javax.sql.StatementEvent" />
<!-- Classpath -->
<path id="tomcat.classpath">
<!-- Common Annotations 1.0 JAR File -->
<jarIt jarfile="${annotations-api.jar}" filesId="files.annotations-api"/>
- <!-- Servlet 2.5 Implementation JAR File -->
+ <!-- Servlet 3.0 Implementation JAR File -->
<filter token="implementation.revision"
value="${servlet.revision}"/>
<copy tofile="res/manifest.tmp"
</xslt>
</target>
- <target name="warn.dbcp" unless="tomcat-dbcp.present">
- <echo>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.</echo>
- </target>
-
- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
+ <target name="deploy" depends="build-only,build-docs">
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
file="${tomcat-native.tar.gz}" />
</target>
- <target name="build-tomcat-dbcp" unless="jdk16.present">
+ <target name="build-tomcat-dbcp">
<copy todir="${tomcat-dbcp.home}">
- <!--
- <fileset dir="${commons-collections.home}" >
- <include name="**/collections/CursorableLinkedList.java" />
- <include name="**/collections/KeyValue.java" />
- <include name="**/collections/LRUMap.java" />
- <include name="**/collections/SequencedHashMap.java" />
- </fileset>
- -->
<fileset dir="${commons-pool.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
<fileset dir="${commons-dbcp.home}">
<include name="**/*.java" />
<exclude name="**/test/**" />
+ <exclude name="**/managed/**" />
</fileset>
</copy>
- <!--
- <replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons">
- <replacefilter token="return UnmodifiableList.decorate(l);"
- value="return l;" />
- <replacefilter token="import org.apache.commons.collections.list.UnmodifiableList;"
- value=" " />
- </replace>
- -->
<replace dir="${tomcat-dbcp.home}/src/java/org/apache/commons" >
<replacefilter token="org.apache.commons"
value="org.apache.tomcat.dbcp" />
<fileset dir="${tomcat-dbcp.home}/src/java/org/apache/commons" />
</move>
<mkdir dir="${tomcat-dbcp.home}/classes"/>
- <!-- TODO Fix DBCP so it builds on 1.6 JDKs -->
<javac destdir="${tomcat-dbcp.home}/classes"
optimize="off"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- source="1.5"
- target="1.5"
+ source="${compile.source}"
+ target="${compile.target}"
sourcepath="${tomcat-dbcp.home}/src/java"
srcdir="${tomcat-dbcp.home}/src/java" >
<include name="**" />
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Tomcat 6.0" default="release" basedir=".">
+<project name="Tomcat 7.0" default="release" basedir=".">
<!-- ===================== Initialize Property Values =================== -->
<!-- Project Properties -->
<property name="project" value="apache-tomcat" />
<property name="name" value="Apache Tomcat" />
- <property name="year" value="2008" />
- <property name="version.major" value="6" />
+ <property name="year" value="2009" />
+ <property name="version.major" value="7" />
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
<!-- constant to declare a file binary for md5sum -->
<property name="md5sum.binary-prefix" value=" *" />
- <!-- Can't be lower - jsp uses templates -->
- <property name="compile.source" value="1.5"/>
+ <!-- Servlet 3.0 spec requires 1.6+ -->
+ <property name="compile.source" value="1.6"/>
<!-- JAR artifacts -->
<property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
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" >
</javadoc>
<!-- ==================== RELEASE: Create Release ======================= -->
<target name="release" depends="clean,dist-static,dist-deployer,installer,package-zip,package-tgz,package-deployer-zip,package-deployer-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz"
- description="Create a Tomcat 6 packaged distribution">
+ description="Create a Tomcat 7 packaged distribution">
<copy file="KEYS"
todir="${tomcat.release}/v${version}"/>
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Tomcat 6.0" default="extras" basedir=".">
+<project name="Tomcat 7.0" default="extras" basedir=".">
<!-- ===================== Initialize Property Values =================== -->
<!-- Project Properties -->
<property name="project" value="apache-tomcat" />
<property name="name" value="Apache Tomcat" />
- <property name="year" value="2008" />
- <property name="version.major" value="6" />
+ <property name="year" value="2009" />
+ <property name="version.major" value="7" />
<property name="version.minor" value="0" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
- <!-- Can't be lower - jsp uses templates -->
- <property name="compile.source" value="1.5"/>
+ <!-- Servlet 3.0 spec requires 1.6+ -->
+ <property name="compile.source" value="1.6"/>
<!-- JAR artifacts -->
<property name="bootstrap.jar" value="${tomcat.build}/bin/bootstrap.jar"/>
projects / tomcat7.0 / commitdiff