Author: kkolinko
Date: Tue Jan 8 19:01:22 2013
New Revision: 1430445
URL: http://svn.apache.org/viewvc?rev=1430445&view=rev
Log:
Running Tomcat 8 needs Java 7
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/RUNNING.txt
tomcat/trunk/webapps/docs/appdev/deployment.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/index.xml
tomcat/trunk/webapps/docs/setup.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1430445&r1=1430444&r2=1430445&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Tue Jan 8 19:01:22 2013
@@ -22,7 +22,7 @@ $Id$
====================================================
This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
-implements the Servlet 3.0 and JSP 2.1 specifications from the Java
+implements the Servlet 3.1 and JSP 2.2 specifications from the Java
Community Process <http://www.jcp.org/>.
Note: If you just need to run Apache Tomcat, it is not necessary to build
Modified: tomcat/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/RUNNING.txt?rev=1430445&r1=1430444&r2=1430445&view=diff
==============================================================================
--- tomcat/trunk/RUNNING.txt (original)
+++ tomcat/trunk/RUNNING.txt Tue Jan 8 19:01:22 2013
@@ -22,16 +22,16 @@ $Id$
===================================================
Apache Tomcat @VERSION_MAJOR_MINOR@ requires a Java Standard Edition Runtime
-Environment (JRE) version 6.0 or later.
+Environment (JRE) version 7 or later.
=============================
-Running With JRE 6.0 Or Later
+Running With JRE 7 Or Later
=============================
(1) Download and Install a Java SE Runtime Environment (JRE)
(1.1) Download a Java SE Runtime Environment (JRE),
- release version 6.0 or later, from
+ release version 7 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
Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/deployment.xml?rev=1430445&r1=1430444&r2=1430445&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/deployment.xml Tue Jan 8 19:01:22 2013
@@ -136,7 +136,7 @@ drivers that are required for both your
<p>Out of the box, a standard Tomcat installation includes a variety
of pre-installed shared library files, including:</p>
<ul>
-<li>The <em>Servlet 3.0</em> and <em>JSP 2.1</em> APIs that are fundamental
+<li>The <em>Servlet 3.1</em> and <em>JSP 2.2</em> APIs that are fundamental
to writing servlets and JavaServer Pages.<br/><br/></li>
<li>An <em>XML Parser</em> compliant with the JAXP (version 1.2) APIs, so
your application can perform DOM-based or SAX-based processing of
Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1430445&r1=1430444&r2=1430445&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Tue Jan 8 19:01:22 2013
@@ -143,7 +143,7 @@ loaders as it is initialized:</p>
<li><em>jasper.jar</em> — Tomcat Jasper JSP Compiler and
Runtime.</li>
<li><em>jasper-el.jar</em> — Tomcat Jasper EL implementation.</li>
<li><em>jsp-api.jar</em> — JSP 2.2 API.</li>
- <li><em>servlet-api.jar</em> — Servlet 3.0 API.</li>
+ <li><em>servlet-api.jar</em> — Servlet 3.1 API.</li>
<li><em>tomcat-api.jar</em> — Several interfaces defined by
Tomcat.</li>
<li><em>tomcat-coyote.jar</em> — Tomcat connectors and utility
classes.</li>
<li><em>tomcat-dbcp.jar</em> — Database connection pool
Modified: tomcat/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1430445&r1=1430444&r2=1430445&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Tue Jan 8 19:01:22 2013
@@ -34,8 +34,8 @@
<section name="Introduction">
<p>This is the top-level entry point of the documentation bundle for the
-<strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version
7.0
-implements the Servlet 3.0 and JavaServer Pages 2.2
+<strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version
8.0
+implements the Servlet 3.1 and JavaServer Pages 2.2
<a href="http://wiki.apache.org/tomcat/Specifications";>specifications</a> from
the
<a href="http://www.jcp.org";>Java Community Process</a>, and includes many
additional features that make it a useful platform for developing and deploying
Modified: tomcat/trunk/webapps/docs/setup.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/setup.xml?rev=1430445&r1=1430444&r2=1430445&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/setup.xml (original)
+++ tomcat/trunk/webapps/docs/setup.xml Tue Jan 8 19:01:22 2013
@@ -63,12 +63,12 @@
administration tool and its documentation).</li>
<li><strong>Java location</strong>: The installer will provide a
default
JRE to use to run the service. The installer uses the registry to
- determine the base path of a Java 6 or later JRE, including the JRE
+ determine the base path of a Java 7 or later JRE, including the JRE
installed as part of the full JDK. When running on a 64-bit
operating system, the installer will first look for a 64-bit JRE
and
only look for a 32-bit JRE if a 64-bit JRE is not found. It is not
mandatory to use the default JRE detected by the installer. Any
- installed Java 6 or later JRE (32-bit or 64-bit) may be used.</li>
+ installed Java 7 or later JRE (32-bit or 64-bit) may be used.</li>
<li><strong>Tray icon</strong>: When Tomcat is run as a service, there
will not be any tray icon present when Tomcat is running. Note that
when choosing to run Tomcat at the end of installation, the tray
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
