Author: markt
Date: Wed Jun 12 19:49:56 2013
New Revision: 1492397
URL: http://svn.apache.org/r1492397
Log:
Various version updates:
Servlet 3.0 -> 3.1
JSP 2.2 -> 2.3
EL 2.2 -> 3.0
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/build.xml
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/package.html
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/realm/package.html
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/res/META-INF/el-api.jar.manifest
tomcat/trunk/res/META-INF/jsp-api.jar.manifest
tomcat/trunk/res/META-INF/servlet-api.jar.manifest
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java
tomcat/trunk/webapps/docs/appdev/deployment.xml
tomcat/trunk/webapps/docs/appdev/introduction.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/index.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
tomcat/trunk/webapps/docs/project.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Wed Jun 12 19:49:56 2013
@@ -22,8 +22,8 @@ $Id$
====================================================
This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
-implements the Servlet 3.1 and JSP 2.2 specifications from the Java
-Community Process <http://www.jcp.org/>.
+implements the Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 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
it. You may simply download a binary distribution. It is cross-platform.
Modified: tomcat/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Wed Jun 12 19:49:56 2013
@@ -105,11 +105,11 @@ for use by web applications (by placing
* catalina-ha.jar (High availability package)
* catalina-tribes.jar (Group communication)
* ecj-@[email protected] (Eclipse JDT Java compiler)
-* el-api.jar (EL 2.2 API)
+* el-api.jar (EL 3.0 API)
* jasper.jar (Jasper 2 Compiler and Runtime)
* jasper-el.jar (Jasper 2 EL implementation)
-* jsp-api.jar (JSP 2.2 API)
-* servlet-api.jar (Servlet 3.0 API)
+* jsp-api.jar (JSP 2.3 API)
+* servlet-api.jar (Servlet 3.1 API)
* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
* tomcat-coyote.jar (Tomcat connectors and utility classes)
* tomcat-dbcp.jar (package renamed database connection pool based on Commons
DBCP)
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Jun 12 19:49:56 2013
@@ -657,7 +657,7 @@
filesId="files.annotations-api"
manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- <!-- Servlet 3.0 Implementation JAR File -->
+ <!-- Servlet 3.1 Implementation JAR File -->
<jarIt jarfile="${servlet-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.servlet-api"
@@ -665,7 +665,7 @@
notice="${tomcat.manifests}/servlet-api.jar.notice"
license="${tomcat.manifests}/servlet-api.jar.license" />
- <!-- JSP 2.2 Implementation JAR File -->
+ <!-- JSP 2.3 Implementation JAR File -->
<jarIt jarfile="${jsp-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.jsp-api"
@@ -673,7 +673,7 @@
notice="${tomcat.manifests}/jsp-api.jar.notice"
license="${tomcat.manifests}/jsp-api.jar.license" />
- <!-- JSP 2.2 EL Implementation JAR File -->
+ <!-- EL 3.0 Implementation JAR File -->
<jarIt jarfile="${el-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.el-api"
@@ -1689,9 +1689,9 @@ Apache Tomcat ${version} native binaries
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/jspapi"
version="true"
- windowtitle="JSP 2.2 API Documentation - Apache Tomcat ${version}"
- doctitle="JSP 2.2 API - Apache Tomcat ${version}"
- header="<b>JSP 2.2 - Apache Tomcat ${version}</b>"
+ windowtitle="JSP 2.3 API Documentation - Apache Tomcat ${version}"
+ doctitle="JSP 2.3 API - Apache Tomcat ${version}"
+ header="<b>JSP 2.3 - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
@@ -1706,9 +1706,9 @@ Apache Tomcat ${version} native binaries
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/elapi"
version="true"
- windowtitle="EL 2.2 API Documentation - Apache Tomcat ${version}"
- doctitle="EL 2.2 API - Apache Tomcat ${version}"
- header="<b>EL 2.2 - Apache Tomcat ${version}</b>"
+ windowtitle="EL 3.0 API Documentation - Apache Tomcat ${version}"
+ doctitle="EL 3.0 API - Apache Tomcat ${version}"
+ header="<b>EL 3.0 - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
@@ -2297,7 +2297,7 @@ Apache Tomcat ${version} native binaries
notice="${tomcat.manifests}/servlet-api.jar.notice"
license="${tomcat.manifests}/servlet-api.jar.license" />
- <!-- JSP 2.2 Implementation JAR File -->
+ <!-- JSP 2.3 Implementation JAR File -->
<jarIt jarfile="${jsp-api-src.jar}"
filesDir="java"
filesId="files.jsp-api"
@@ -2305,7 +2305,7 @@ Apache Tomcat ${version} native binaries
notice="${tomcat.manifests}/jsp-api.jar.notice"
license="${tomcat.manifests}/jsp-api.jar.license" />
- <!-- JSP 2.2 EL Implementation JAR File -->
+ <!-- JSP EL 3.0 Implementation JAR File -->
<jarIt jarfile="${el-api-src.jar}"
filesDir="java"
filesId="files.el-api"
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Wed Jun 12 19:49:56 2013
@@ -44,7 +44,7 @@ import org.apache.tomcat.util.http.MimeH
/**
* An <b>Authenticator</b> and <b>Valve</b> implementation of FORM BASED
- * Authentication, as described in the Servlet API Specification, Version 2.2.
+ * Authentication, as described in the Servlet API Specification.
*
* @author Craig R. McClanahan
* @author Remy Maucherat
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/package.html?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/package.html Wed Jun 12
19:49:56 2013
@@ -48,7 +48,7 @@ following JavaBeans properties (with def
<li><b>DigestAuthenticator</b> - Implements HTTP DIGEST authentication, as
described in RFC 2617.</li>
<li><b>FormAuthenticator</b> - Implements FORM-BASED authentication, as
- described in the Servlet API Specification, version 2.2.</li>
+ described in the Servlet API Specification.</li>
</ul>
</body>
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Wed Jun
12 19:49:56 2013
@@ -65,7 +65,7 @@ public class CoyoteAdapter implements Ad
// -------------------------------------------------------------- Constants
- private static final String POWERED_BY = "Servlet/3.1 JSP/2.2 " +
+ private static final String POWERED_BY = "Servlet/3.1 JSP/2.3 " +
"(" + ServerInfo.getServerInfo() + " Java/" +
System.getProperty("java.vm.vendor") + "/" +
System.getProperty("java.runtime.version") + ")";
Modified: tomcat/trunk/java/org/apache/catalina/realm/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/package.html?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/package.html Wed Jun 12
19:49:56 2013
@@ -22,7 +22,7 @@ identifying their associated roles. The
associated with a web application's <code>Context</code> (or a hierarchically
superior Container) is used to resolve authentication and role presence
questions when a web application uses container managed security as described
-in the Servlet API Specification, version 2.2.</p>
+in the Servlet API Specification.</p>
<p>The implementations share a common base class that supports basic
functionality for all of the standard <code>Realm</code> implementations,
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Wed Jun 12
19:49:56 2013
@@ -522,7 +522,8 @@ class Validator {
JspUtil.checkAttributes("Jsp:root", n, jspRootAttrs, err);
String version = n.getTextAttribute("version");
if (!version.equals("1.2") && !version.equals("2.0") &&
- !version.equals("2.1") && !version.equals("2.2")) {
+ !version.equals("2.1") && !version.equals("2.2") &&
+ !version.equals("2.3")) {
err.jspError(n, "jsp.error.jsproot.version.invalid", version);
}
visitBody(n);
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed
Jun 12 19:49:56 2013
@@ -74,7 +74,7 @@ jsp.error.unable.compile=Unable to compi
jsp.error.unable.load=Unable to load class for JSP
jsp.error.mandatory.attribute={0}: Mandatory attribute {1} missing
jsp.error.flush=Exception occurred when flushing data
-jsp.engine.info=Jasper JSP 2.2 Engine
+jsp.engine.info=Jasper JSP 2.3 Engine
jsp.error.invalid.expression="{0}" contains invalid expression(s): {1}
jsp.error.invalid.attribute={0} has invalid attribute: {1}
jsp.error.file.cannot.read=Cannot read file: {0}
@@ -336,7 +336,7 @@ jsp.error.variable.both.name=Cannot spec
jsp.error.variable.alias=Both or none of the name-from-attribute and alias
attributes must be specified in a variable directive
jsp.error.attribute.null_name=Null attribute name
jsp.error.jsptext.badcontent=\'<\', when appears in the body of
<jsp:text>, must be encapsulated within a CDATA
-jsp.error.jsproot.version.invalid=Invalid version number: \"{0}\", must be
\"1.2\", \"2.0\", \"2.1\" or \"2.2\"
+jsp.error.jsproot.version.invalid=Invalid version number: \"{0}\", must be
\"1.2\", \"2.0\", \"2.1\", \"2.2\" or \"2.3\"
jsp.error.noFunctionPrefix=The function {0} must be used with a prefix when a
default namespace is not specified
jsp.error.noFunction=The function {0} cannot be located with the specified
prefix
jsp.error.noFunctionMethod=Method \"{0}\" for function \"{1}\" not found in
class \"{2}\"
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Wed Jun 12 19:49:56 2013
@@ -72,7 +72,7 @@ jsp.error.unable.compile = No se puede c
jsp.error.unable.load = No se puede cargar la clase para JSP
jsp.error.mandatory.attribute = {0}\: Falta atributo obligatorio {1}
jsp.error.flush = Excepci\u00F3n sucedida al vaciar los datos
-jsp.engine.info = Motor Jasper JSP 2.2
+jsp.engine.info = Motor Jasper JSP 2.3
jsp.error.invalid.expression = "{0}" contiene expresiones incorrectas\: {1}
jsp.error.invalid.attribute = {0}\: Atributo incorrecto, {1}
jsp.error.file.cannot.read = No se puede leer el archivo\: {0}
@@ -333,7 +333,7 @@ jsp.error.variable.both.name = No se pue
jsp.error.variable.alias = Ambos atributos o ninguno de name-from-attribute y
alias pueden ser especificados en una directiva variable
jsp.error.attribute.null_name = Nombre de atributo nulo
jsp.error.jsptext.badcontent = '<', cuando aparece en el cuerpo de
<jsp\:text>, debe de estar encapsulado dentro de un CDATA
-jsp.error.jsproot.version.invalid = N\u00FAmero incorrecto de versi\u00F3n\:
"{0}", debe de ser "1.2" o "2.0" o "2.1" o "2.2"
+jsp.error.jsproot.version.invalid = N\u00FAmero incorrecto de versi\u00F3n\:
"{0}", debe de ser "1.2" o "2.0" o "2.1" o "2.2" o "2.3"
jsp.error.noFunctionPrefix = La funci\u00F3n {0} debe de usarse con un prefijo
cuando no se especifica un espacio de nombres por defecto
jsp.error.noFunction = La funci\u00F3n {0} no puede ser localizada mediante el
prefijo especificado
jsp.error.noFunctionMethod = El m\u00E9todo "{0}" para la funci\u00F3n "{1}"
no se pudo hallar en la clase "{2}"
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Wed Jun 12 19:49:56 2013
@@ -47,7 +47,7 @@ jsp.error.loadclass.taghandler=Impossibl
jsp.error.unable.compile=Impossible de compiler la classe pour la JSP
jsp.error.unable.load=Impossible de charger la classe pour la JSP
jsp.error.mandatory.attribute={0}: L''attribut obligatoire {1} est manquant
-jsp.engine.info=Moteur Jasper JSP 2.2
+jsp.engine.info=Moteur Jasper JSP 2.3
jsp.error.invalid.expression="{0}" contient d''incorrecte(s) expression(s): {1}
jsp.error.invalid.attribute={0}: Attribut incorrect: {1}
jsp.error.file.cannot.read=Impossible de lire le fichier: {0}
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Wed Jun 12 19:49:56 2013
@@ -67,7 +67,7 @@ jsp.error.loadclass.taghandler=\u30bf\u3
jsp.error.unable.compile=JSP\u306e\u30af\u30e9\u30b9\u3092\u30b3\u30f3\u30d1\u30a4\u30eb\u3067\u304d\u307e\u305b\u3093
jsp.error.unable.load=JSP\u306e\u30af\u30e9\u30b9\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093
jsp.error.mandatory.attribute={0}: \u5fc5\u9808\u5c5e\u6027 {1}
\u304c\u3042\u308a\u307e\u305b\u3093
-jsp.engine.info=Jasper JSP 2.2\u30a8\u30f3\u30b8\u30f3
+jsp.engine.info=Jasper JSP 2.3\u30a8\u30f3\u30b8\u30f3
jsp.error.invalid.expression="{0}"
\u306f\u7121\u52b9\u306a\u5f0f\u3092\u542b\u3093\u3067\u3044\u307e\u3059: {1}
jsp.error.invalid.attribute={0}\u306f\u7121\u52b9\u306a\u5c5e\u6027\u3092\u6301\u3063\u3066\u3044\u307e\u3059:
{1}
jsp.error.file.cannot.read=\u30d5\u30a1\u30a4\u30eb\u304c\u8aad\u3081\u307e\u305b\u3093:
{0}
@@ -299,7 +299,7 @@ jsp.error.variable.both.name=variable\u6
jsp.error.variable.alias=name-from-attribute\u304a\u3088\u3073alias\u5c5e\u6027\u306e\u4e21\u65b9\u3092variable\u6307\u793a\u5b50\u4e2d\u306b\u6307\u5b9a\u3059\u308b\u3001\u53c8\u306f\u3069\u3061\u3089\u3082\u6307\u5b9a\u3057\u306a\u3044\u3053\u3068\u304c\u3067\u304d\u307e\u3059
jsp.error.attribute.null_name=\u7a7a\u306e\u5c5e\u6027\u540d\u3067\u3059
jsp.error.jsptext.badcontent=\'<\'\u304c<jsp:text>\u306e\u30dc\u30c7\u30a3\u306e\u4e2d\u306b\u73fe\u308c\u308b\u6642\u306f\u3001CDATA\u306e\u4e2d\u306b\u96a0\u853d\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
-jsp.error.jsproot.version.invalid=\u7121\u52b9\u306a\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3067\u3059:
\"{0}\"\u3001\"1.2\"\u3000\"2.0\"\u3000\"2.1\" \u53c8\u306f
\"2.2\"\u3000\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
+jsp.error.jsproot.version.invalid=\u7121\u52b9\u306a\u30d0\u30fc\u30b8\u30e7\u30f3\u756a\u53f7\u3067\u3059:
\"{0}\"\u3001\"1.2\"\u3000\"2.0\"\u3000\"2.1\"\u3000\"2.2\" \u53c8\u306f
\"2.3\"\u3000\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
jsp.error.noFunctionPrefix=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u540d\u524d\u7a7a\u9593\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u306a\u3044\u6642\u306b\u306f\u3001\u95a2\u6570
{0}
\u306f\u30d7\u30ea\u30d5\u30a3\u30af\u30b9\u4ed8\u304d\u3067\u4f7f\u7528\u3057\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093
jsp.error.noFunction=\u95a2\u6570 {0}
\u3092\u6307\u5b9a\u3055\u308c\u305f\u30d7\u30ea\u30d5\u30a3\u30af\u30b9\u3067\u914d\u7f6e\u3067\u304d\u307e\u305b\u3093
jsp.error.noFunctionMethod=\u95a2\u6570 \"{1}\" \u306e\u30e1\u30bd\u30c3\u30c9
\"{0}\" \u304c \"{2}\" \u4e2d\u3067\u898b\u3064\u304b\u308a\u307e\u305b\u3093
Modified: tomcat/trunk/res/META-INF/el-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/el-api.jar.manifest?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/el-api.jar.manifest (original)
+++ tomcat/trunk/res/META-INF/el-api.jar.manifest Wed Jun 12 19:49:56 2013
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
Name: javax/el/
Specification-Title: Expression Language
-Specification-Version: 2.2
+Specification-Version: 3.0
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: javax.el
-Implementation-Version: [email protected]@
+Implementation-Version: [email protected]@
Implementation-Vendor: Apache Software Foundation
Modified: tomcat/trunk/res/META-INF/jsp-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jsp-api.jar.manifest?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/jsp-api.jar.manifest (original)
+++ tomcat/trunk/res/META-INF/jsp-api.jar.manifest Wed Jun 12 19:49:56 2013
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
Name: javax/servlet/jsp/
Specification-Title: Java API for JavaServer Pages
-Specification-Version: 2.2
+Specification-Version: 2.3
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: javax.servlet.jsp
-Implementation-Version: [email protected]@
+Implementation-Version: [email protected]@
Implementation-Vendor: Apache Software Foundation
Modified: tomcat/trunk/res/META-INF/servlet-api.jar.manifest
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/servlet-api.jar.manifest?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/servlet-api.jar.manifest (original)
+++ tomcat/trunk/res/META-INF/servlet-api.jar.manifest Wed Jun 12 19:49:56 2013
@@ -4,8 +4,8 @@ X-Compile-Target-JDK: @target.jdk@
Name: javax/servlet/
Specification-Title: Java API for Servlets
-Specification-Version: 3.0
+Specification-Version: 3.1
Specification-Vendor: Sun Microsystems, Inc.
Implementation-Title: javax.servlet
-Implementation-Version: [email protected]@
+Implementation-Version: [email protected]@
Implementation-Vendor: Apache Software Foundation
Modified:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperContextRoot.java Wed
Jun 12 19:49:56 2013
@@ -59,7 +59,7 @@ public class TestMapperContextRoot exten
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- // Confirm behaviour as per Servler 12.2
+ // Confirm behaviour as per Servlet 12.2
boolean pass = "/".equals(req.getPathInfo());
if (pass) {
pass = "".equals(req.getServletPath());
Modified: tomcat/trunk/webapps/docs/appdev/deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/deployment.xml?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/deployment.xml Wed Jun 12 19:49:56 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.1</em> and <em>JSP 2.2</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/trunk/webapps/docs/appdev/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/appdev/introduction.xml?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/appdev/introduction.xml (original)
+++ tomcat/trunk/webapps/docs/appdev/introduction.xml Wed Jun 12 19:49:56 2013
@@ -62,8 +62,8 @@ the details of your particular environme
information, documentation, and software that is useful in developing
web applications with Tomcat.</p>
<ul>
-<li><a
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index.html";>http://jcp.org/aboutJava/communityprocess/mrel/jsr245/</a>
-
- <i>JavaServer Pages (JSP) Specification, Version 2.2</i>. Describes
+<li><a
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html</a>
-
+ <i>JavaServer Pages (JSP) Specification, Version 2.3</i>. Describes
the programming environment provided by standard implementations
of the JavaServer Pages (JSP) technology. In conjunction with
the Servlet API Specification (see below), this document describes
@@ -72,8 +72,8 @@ 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.<br/><br/></li>
-<li><a
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr315/index.html";>http://jcp.org/aboutJava/communityprocess/mrel/jsr315/</a>
-
- <i>Servlet API Specification, Version 3.0</i>. Describes the
+<li><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
containers conforming to this specification. In particular, you
will need this document to understand the web application
Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Wed Jun 12 19:49:56 2013
@@ -139,10 +139,10 @@ loaders as it is initialized:</p>
<li><em>catalina-ha.jar</em> — High availability package.</li>
<li><em>catalina-tribes.jar</em> — Group communication package.</li>
<li><em>ecj-*.jar</em> — Eclipse JDT Java compiler.</li>
- <li><em>el-api.jar</em> — EL 2.2 API.</li>
+ <li><em>el-api.jar</em> — EL 3.0 API.</li>
<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>jsp-api.jar</em> — JSP 2.3 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>
Modified: tomcat/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Wed Jun 12 19:49:56 2013
@@ -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
8.0
-implements the Servlet 3.1 and JavaServer Pages 2.2
+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
@@ -160,18 +160,29 @@ are responsible for installing, configur
- Complete documentation and HOWTOs on the JK native webserver connector,
used to interface Apache Tomcat with servers like Apache HTTPd, IIS
and others.</li>
-<li>Servlet 3.0
- <a
href="http://jcp.org/aboutJava/communityprocess/final/jsr315/index.html";>
+<li>Servlet 3.1
+ <a
href="http://jcp.org/aboutJava/communityprocess/final/jsr340/index.html";>
<strong>Specification</strong></a> and
- <a
href="http://docs.oracle.com/javaee/6/api/index.html?javax/servlet/package-summary.html";>
+ <a
href="http://docs.oracle.com/javaee/7/api/javax/servlet/package-summary.html";>
<strong>Javadoc</strong></a>
</li>
-<li><a href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index.html";>
- <strong>JSP 2.2 and EL 2.2 Specifications</strong></a>,
- <a
href="http://docs.oracle.com/javaee/6/api/index.html?javax/servlet/jsp/package-summary.html";>
- <strong>JSP 2.2 Javadoc (note it is labelled as JSP 2.1)</strong></a>,
- <a
href="http://docs.oracle.com/javaee/6/api/index.html?javax/el/package-summary.html";>
- <strong>EL 2.2 Javadoc</strong></a>
+<li>JSP 2.3
+ <a
href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html";>
+ <strong>Specification</strong></a> and
+ <a
href="http://docs.oracle.com/javaee/7/api/javax/servlet/jsp/package-summary.html";>
+ <strong>Javadoc</strong></a>
+ </li>
+<li>EL 3.0
+ <a
href="http://jcp.org/aboutJava/communityprocess/final/jsr341/index.html";>
+ <strong>Specification</strong></a> and
+ <a
href="http://docs.oracle.com/javaee/7/api/javax/el/package-summary.html";>
+ <strong>Javadoc</strong></a>
+ </li>
+<li>WebSocket 1.0
+ <a
href="http://jcp.org/aboutJava/communityprocess/final/jsr356/index.html";>
+ <strong>Specification</strong></a> and
+ <a
href="http://docs.oracle.com/javaee/7/api/javax/websocket/package-summary.html";>
+ <strong>Javadoc</strong></a>
</li>
</ul>
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Wed Jun 12 19:49:56 2013
@@ -36,8 +36,8 @@
<section name="Introduction">
-<p>Tomcat 7.0 uses the Jasper 2 JSP Engine to implement
-the <a href="http://wiki.apache.org/tomcat/Specifications";>JavaServer Pages
2.2</a>
+<p>Tomcat 8.0 uses the Jasper 2 JSP Engine to implement
+the <a href="http://wiki.apache.org/tomcat/Specifications";>JavaServer Pages
2.3</a>
specification.</p>
<p>Jasper 2 has been redesigned to significantly improve performance over
Modified: tomcat/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1492397&r1=1492396&r2=1492397&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Wed Jun 12 19:49:56 2013
@@ -82,8 +82,8 @@
<item name="Configuration" href="config/index.html"/>
<item name="Tomcat Javadocs" href="api/index.html"/>
<item name="Servlet Javadocs" href="servletapi/index.html"/>
- <item name="JSP 2.2 Javadocs" href="jspapi/index.html"/>
- <item name="EL 2.2 Javadocs" href="elapi/index.html"/>
+ <item name="JSP 2.3 Javadocs" href="jspapi/index.html"/>
+ <item name="EL 3.0 Javadocs" href="elapi/index.html"/>
<item name="JK 1.2 Documentation"
href="http://tomcat.apache.org/connectors-doc/"/>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
