Bug 41089 and JSP.6.3.2

Table JSP.6-2 Attributes for the <jsp:root> standard action
version (required) The version of the JSP specification used in this
page. Valid values are "1.2", "2.0", and "2.1". It is a
translation error if the container does not support the
specified version.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@481230 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java b/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
index dbe9c1e..0d3c9d3 100644 (file)
--- a/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
+++ b/java/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
@@ -48,7 +48,7 @@ class ImplicitTagLibraryInfo extends TagLibraryInfo {
     private static final String TAGX_FILE_SUFFIX = ".tagx";
     private static final String TAGS_SHORTNAME = "tags";
     private static final String TLIB_VERSION = "1.0";
-    private static final String JSP_VERSION = "2.0";
+    private static final String JSP_VERSION = "2.1";
     private static final String IMPLICIT_TLD = "implicit.tld";
 
     // Maps tag names to tag file paths

diff --git a/java/org/apache/jasper/compiler/PageDataImpl.java b/java/org/apache/jasper/compiler/PageDataImpl.java
index deb4adf..90e0c55 100644 (file)
--- a/java/org/apache/jasper/compiler/PageDataImpl.java
+++ b/java/org/apache/jasper/compiler/PageDataImpl.java
@@ -48,7 +48,7 @@ import org.apache.jasper.JasperException;
  */
 class PageDataImpl extends PageData implements TagConstants {
 
-    private static final String JSP_VERSION = "2.0";
+    private static final String JSP_VERSION = "2.1";
     private static final String CDATA_START_SECTION = "<![CDATA[\n";
     private static final String CDATA_END_SECTION = "]]>\n";
 

diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java
index 21c111d..4d95a3f 100644 (file)
--- a/java/org/apache/jasper/compiler/Validator.java
+++ b/java/org/apache/jasper/compiler/Validator.java
@@ -509,7 +509,7 @@ class Validator {
         public void visit(Node.JspRoot n) throws JasperException {
             JspUtil.checkAttributes("Jsp:root", n, jspRootAttrs, err);
             String version = n.getTextAttribute("version");
-            if (!version.equals("1.2") && !version.equals("2.0")) {
+            if (!version.equals("1.2") && !version.equals("2.0") && !version.equals("2.1")) {
                 err.jspError(n, "jsp.error.jsproot.version.invalid", version);
             }
             visitBody(n);

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties
index 917f49e..b51b359 100644 (file)
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -93,7 +93,7 @@ jsp.error.unable.load=Unable to load class for JSP
 jsp.error.unable.rename=Unable to rename class file {0} to {1}
 jsp.error.mandatory.attribute={0}: Mandatory attribute {1} missing
 jsp.error.flush=Exception occurred when flushing data
-jsp.engine.info=Jasper JSP 2.0 Engine
+jsp.engine.info=Jasper JSP 2.1 Engine
 jsp.error.invalid.expression="{0}" contains invalid expression(s): {1}
 jsp.error.invalid.attribute={0} has invalid attribute: {1}
 jsp.error.usebean.class.notfound=Class: {0} not found
@@ -410,7 +410,7 @@ jsp.error.variable.both.name=Cannot specify both name-given or name-from-attribu
 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\" or \"2.0\"
+jsp.error.jsproot.version.invalid=Invalid version number: \"{0}\", must be \"1.2\", \"2.0\", or  \"2.1\"
 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}\"
@@ -437,4 +437,4 @@ jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Tag directive: illegal to
 jsp.error.page.invalid.trimdirectivewhitespaces=Page directive: invalid value for trimDirectiveWhitespaces
 jsp.error.tag.invalid.trimdirectivewhitespaces=Tag directive: invalid value for trimDirectiveWhitespaces
 jsp.error.page.conflict.trimdirectivewhitespaces=Page directive: illegal to have multiple occurrences of 'trimDirectiveWhitespaces' with different values (old: {0}, new: {1})
-jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have multiple occurrences of 'trimDirectiveWhitespaces' with different values (old: {0}, new: {1})
\ No newline at end of file
+jsp.error.tag.conflict.trimdirectivewhitespaces=Tag directive: illegal to have multiple occurrences of 'trimDirectiveWhitespaces' with different values (old: {0}, new: {1})

diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index ff15399..cce942c 100644 (file)
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -85,7 +85,7 @@ jsp.error.unable.compile=No se puede compilar la clase para JSP
 jsp.error.unable.load=No se puede cargar la clase para JSP
 jsp.error.unable.rename=No se puede renombrar el archivo de clase {0} a {1}
 jsp.error.mandatory.atributo={0}: atributo obligatorio {1} perdido
-jsp.engine.info=Motor Jasper JSP 2.0
+jsp.engine.info=Motor Jasper JSP 2.1
 jsp.error.invalid.expression="{0}" contiene expresiones incorrectas: {1}
 jsp.error.invalid.attribute={0}: Atributo incorrecto, {1}
 jsp.error.usebean.class.notfound=Clase: {0} no hallada
@@ -394,7 +394,7 @@ jsp.error.variable.both.name=No se puede especificar ambos atributos name-given
 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úmero incorrecto de versión: \"{0}\", debe de ser \"1.2\" o \"2.0\"
+jsp.error.jsproot.version.invalid=Número incorrecto de versión: \"{0}\", debe de ser \"1.2\" o \"2.0\" o \"2.1\"
 jsp.error.noFunctionPrefix=La función {0} debe de usarse con un prefijo cuando no se especifica un espacio de nombres por defecto
 jsp.error.noFunction=La función {0} no puede ser localizada mediante el prefijo especificado
 jsp.error.noFunctionMethod=El método \"{0}\" para la función \"{1}\" no se pudo hallar en la clase \"{2}\"