From 71f617e997cf8707bef8ec97a8a34ce639220ae9 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 7 Jan 2010 14:20:30 +0000 Subject: [PATCH] Update for JSP 2.2 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@896892 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/Validator.java | 3 ++- java/org/apache/jasper/resources/LocalStrings.properties | 2 +- java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java index 8aebdec26..3270a254c 100644 --- a/java/org/apache/jasper/compiler/Validator.java +++ b/java/org/apache/jasper/compiler/Validator.java @@ -518,7 +518,8 @@ 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") && !version.equals("2.1")) { + if (!version.equals("1.2") && !version.equals("2.0") && + !version.equals("2.1") && !version.equals("2.2")) { 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 d1b53908d..64d7e0d6a 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -427,7 +427,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\", \"2.0\", or \"2.1\" +jsp.error.jsproot.version.invalid=Invalid version number: \"{0}\", must be \"1.2\", \"2.0\", \"2.1\" or \"2.2\" 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}\" diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties index 971575f24..128626943 100644 --- a/java/org/apache/jasper/resources/LocalStrings_es.properties +++ b/java/org/apache/jasper/resources/LocalStrings_es.properties @@ -430,7 +430,7 @@ jsp.error.variable.both.name = No se puede especificar ambos atributos name-give 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" +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.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}" -- 2.11.0