Author: markt
Date: Sun Mar 13 20:02:26 2016
New Revision: 1734850
URL: http://svn.apache.org/viewvc?rev=1734850&view=rev
Log:
Review doc web application for Tomcat 9 / Servlet 4.0 references
Modified:
tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml
tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/building.xml
tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/config/project.xml
tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-default.xml
tomcat/tc8.5.x/trunk/webapps/docs/index.xml
tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc8.5.x/trunk/webapps/docs/project.xml
Modified: tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/WEB-INF/web.xml Sun Mar 13 20:02:26 2016
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0"
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1"
metadata-complete="true">
<display-name>Tomcat Documentation</display-name>
Modified: tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/appdev/deployment.xml Sun Mar 13 20:02:26
2016
@@ -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 4.0</em> and <em>JSP 2.3</em> APIs that are fundamental
+<li>The <em>Servlet 3.1</em> and <em>JSP 2.3</em> APIs that are fundamental
to writing servlets and JavaServer Pages.<br/><br/></li>
</ul>
Modified: tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/appdev/introduction.xml Sun Mar 13
20:02:26 2016
@@ -72,7 +72,6 @@ web applications with Tomcat.</p>
and packaging JSP pages (Appendix A) is useful. The Javadoc
API Documentation is included in the specification, and with the
Tomcat download.</p></li>
-<!-- TODO Servley 4.0 -->
<li><p><a
href="http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html";>http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html</a>
-
<i>Servlet API Specification, Version 3.1</i>. Describes the
programming environment that must be provided by all servlet
Modified: tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml
(original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/appdev/sample/web/WEB-INF/web.xml Sun Mar
13 20:02:26 2016
@@ -18,8 +18,8 @@
<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0">
+ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd";
+ version="3.1">
<display-name>Hello, World Application</display-name>
<description>
Modified: tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/architecture/project.xml Sun Mar 13
20:02:26 2016
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Tomcat 9 Architecture"
+<project name="Apache Tomcat 8 Architecture"
href="http://tomcat.apache.org/";>
- <title>Apache Tomcat 9 Architecture</title>
+ <title>Apache Tomcat 8 Architecture</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
Modified: tomcat/tc8.5.x/trunk/webapps/docs/building.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/building.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/building.xml Sun Mar 13 20:02:26 2016
@@ -43,10 +43,10 @@ The following is a quick step by step gu
</section>
-<section name="Download a Java Development Kit (JDK) version 8">
+<section name="Download a Java Development Kit (JDK) version 7">
<p>
-Building Apache Tomcat requires a JDK (version 8) to be installed. You can
download one from<br />
+Building Apache Tomcat requires a JDK (version 7) to be installed. You can
download one from<br />
<a
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>http://www.oracle.com/technetwork/java/javase/downloads/index.html</a><br/>
<a
href="http://openjdk.java.net/install/index.html";>http://openjdk.java.net/install/index.html</a><br/>
or another JDK vendor.
@@ -87,7 +87,7 @@ available, which will be used to actuall
<p>
Tomcat SVN repository URL:
- <a
href="http://svn.apache.org/repos/asf/tomcat/trunk/";>http://svn.apache.org/repos/asf/tomcat/trunk/</a>
+ <a
href="http://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/";>http://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk/</a>
</p>
<p>
Tomcat source packages:
Modified: tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/class-loader-howto.xml Sun Mar 13
20:02:26 2016
@@ -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.3 API.</li>
- <li><em>servlet-api.jar</em> — Servlet 4.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/tc8.5.x/trunk/webapps/docs/config/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/config/project.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/config/project.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/config/project.xml Sun Mar 13 20:02:26
2016
@@ -15,10 +15,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Apache Tomcat 9 Configuration Reference"
+<project name="Apache Tomcat 8 Configuration Reference"
href="http://tomcat.apache.org/";>
- <title>Apache Tomcat 9 Configuration Reference</title>
+ <title>Apache Tomcat 8 Configuration Reference</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
Modified: tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-default.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-default.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-default.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/funcspecs/fs-default.xml Sun Mar 13
20:02:26 2016
@@ -52,7 +52,7 @@
partially define the correct behavior of the default servlet:</p>
<ul>
<li><a
href="http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html";>
- Servlet Specification</a> (Version 4.0)</li>
+ Servlet Specification</a> (Version 3.1)</li>
<li><a href="http://www.rfc-editor.org/rfc/rfc2046.txt";>Multipurpose
Internet Mail Extensions (MIME) Part Two: Media Types</a></li>
<li><a href="http://www.rfc-editor.org/rfc/rfc2616.txt";>Hypertext
Modified: tomcat/tc8.5.x/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/index.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/index.xml Sun Mar 13 20:02:26 2016
@@ -35,7 +35,7 @@
<p>This is the top-level entry point of the documentation bundle for the
<strong>Apache Tomcat</strong> Servlet/JSP container. Apache Tomcat version
-<version-major-minor/> implements the Servlet 4.0 and JavaServer Pages 2.3
+<version-major-minor/> implements the Servlet 3.1 and JavaServer Pages 2.3
<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
@@ -166,7 +166,6 @@ are responsible for installing, configur
<strong>Specification</strong></a> and
<a
href="http://docs.oracle.com/javaee/7/api/javax/servlet/package-summary.html";>
<strong>Javadoc</strong></a>
- <p>TODO Servlet 4.0</p>
</li>
<li>JSP 2.3
<a
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>
Modified: tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/jasper-howto.xml Sun Mar 13 20:02:26 2016
@@ -106,10 +106,10 @@ set then <code>setenv.[sh|bat]</code> sh
to the <code>CLASSPATH</code> environment variable.</li>
<li><strong>compilerSourceVM</strong> - What JDK version are the source files
-compatible with? (Default value: <code>1.8</code>)</li>
+compatible with? (Default value: <code>1.7</code>)</li>
<li><strong>compilerTargetVM</strong> - What JDK version are the generated
files
-compatible with? (Default value: <code>1.8</code>)</li>
+compatible with? (Default value: <code>1.7</code>)</li>
<li><strong>development</strong> - Is Jasper used in development mode? If true,
the frequency at which JSPs are checked for modification may be specified via
Modified: tomcat/tc8.5.x/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/project.xml?rev=1734850&r1=1734849&r2=1734850&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/project.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/project.xml Sun Mar 13 20:02:26 2016
@@ -18,7 +18,7 @@
<project name="Apache Tomcat Documentation"
href="http://tomcat.apache.org/";>
- <title>Apache Tomcat 9</title>
+ <title>Apache Tomcat 8</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
