luehe 2003/02/03 12:33:37
Modified: jasper2/src/share/org/apache/jasper/compiler Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_fr.properties messages_ja.properties
Log:
Fixed 16731: A translation error is not raised by the container if
jsp:invoke specifies the 'scope' attribute but not 'var' or
'varReader'
Revision Changes Path
1.72 +17 -9
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- Validator.java 3 Feb 2003 20:11:42 -0000 1.71
+++ Validator.java 3 Feb 2003 20:33:35 -0000 1.72
@@ -946,9 +946,13 @@
String scope = n.getTextAttribute ("scope");
JspUtil.checkScope(scope, n, err);
- if (n.getAttributeValue("var") != null
- && n.getAttributeValue("varReader") != null) {
- err.jspError(n, "jsp.error.invoke.varAndVarReader");
+ String var = n.getAttributeValue("var");
+ String varReader = n.getAttributeValue("varReader");
+ if (scope != null && var == null && varReader == null) {
+ err.jspError(n, "jsp.error.missing_var_or_varReader");
+ }
+ if (var != null && varReader != null) {
+ err.jspError(n, "jsp.error.var_and_varReader");
}
}
@@ -959,9 +963,13 @@
String scope = n.getTextAttribute ("scope");
JspUtil.checkScope(scope, n, err);
- if (n.getAttributeValue("var") != null
- && n.getAttributeValue("varReader") != null) {
- err.jspError(n, "jsp.error.doBody.varAndVarReader");
+ String var = n.getAttributeValue("var");
+ String varReader = n.getAttributeValue("varReader");
+ if (scope != null && var == null && varReader == null) {
+ err.jspError(n, "jsp.error.missing_var_or_varReader");
+ }
+ if (var != null && varReader != null) {
+ err.jspError(n, "jsp.error.var_and_varReader");
}
}
1.88 +3 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- messages.properties 3 Feb 2003 20:11:42 -0000 1.87
+++ messages.properties 3 Feb 2003 20:33:36 -0000 1.88
@@ -295,8 +295,8 @@
jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type' attributes.
If 'fragment' is present, 'type' is fixed as 'javax.servlet.jsp.tagext.JspFragment'
jsp.error.fragmentwithrtexprvalue=Cannot specify both 'fragment' and 'rtexprvalue'
attributes. If 'fragment' is present, 'rtexprvalue' is fixed as 'true'
jsp.error.fragmentWithDeclareOrScope=Both 'fragment' and 'declare' or 'scope'
attributes specified in variable directive
-jsp.error.invoke.varAndVarReader=Both 'var' and 'varReader' specified in jsp:invoke
-jsp.error.doBody.varAndVarReader=Both 'var' and 'varReader' specified in jsp:doBody
+jsp.error.var_and_varReader=Only one of \'var\' or \'varReader\' may be specified
+jsp.error.missing_var_or_varReader=Missing \'var\' or \'varReader\' attribute
jsp.warning.bad.urlpattern.propertygroup=Bad value {0} in the url-pattern
subelement in web.xml
jsp.error.unknown_attribute_type=Unknown attribute type ({1}) for attribute {0}.
jsp.error.jspelement.missing.name=Mandatory attribute 'name' missing in jsp:element
1.33 +2 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- messages_es.properties 1 Feb 2003 02:41:13 -0000 1.32
+++ messages_es.properties 3 Feb 2003 20:33:36 -0000 1.33
@@ -211,8 +211,7 @@
jsp.error.taglibDirective.missing.location=
jsp.error.fragmentwithtype=
jsp.error.fragmentWithDeclareOrScope=
-jsp.error.invoke.varAndVarReader=
-jsp.error.doBody.varAndVarReader=
+jsp.error.var_and_varReader=
jsp.warning.bad.urlpattern.propertygroup=
jsp.error.jspelement.missing.name=
jsp.error.tagdirective.badbodycontent=
1.17 +2 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties
Index: messages_fr.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_fr.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- messages_fr.properties 3 Feb 2003 20:11:43 -0000 1.16
+++ messages_fr.properties 3 Feb 2003 20:33:36 -0000 1.17
@@ -276,8 +276,7 @@
jsp.error.fragmentwithtype=On ne peut indiquer � la fois les attributs 'fragment'
et 'type'. Si 'fragment' est pr�sent, 'type' est fix� comme
'javax.servlet.jsp.tagext.JspFragment'
jsp.error.fragmentwithrtexprvalue=On ne peut indiquer � la fois les attributs
'fragment' et 'rtexprvalue'. Si 'fragment' est pr�sent, 'rtexprvalue' est fix� �
'true'
jsp.error.fragmentWithDeclareOrScope=Les attributs 'fragment' et 'declare' ou
'scope' sont indiqu�s dans la directive variable
-jsp.error.invoke.varAndVarReader=A la fois 'var' et 'varReader' sont indiqu�s dans
jsp:invoke
-jsp.error.doBody.varAndVarReader=A la fois 'var' et 'varReader' sont indiqu�s dans
jsp:doBody
+jsp.error.var_and_varReader=A la fois 'var' et 'varReader' sont indiqu�s
jsp.warning.bad.urlpattern.propertygroup=Mauvaise valeur {0} dans le sous-�l�ment
(subelement) url-pattern du fichier web.xml
jsp.error.unknown_attribute_type=Type d''attribut inconnu ({1}) pour l''attribut
{0}.
jsp.error.jspelement.missing.name=L''attribut obligatoire 'name' est absent de
jsp:element
1.33 +2 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- messages_ja.properties 1 Feb 2003 02:41:13 -0000 1.32
+++ messages_ja.properties 3 Feb 2003 20:33:36 -0000 1.33
@@ -242,8 +242,7 @@
jsp.error.taglibDirective.missing.location=
jsp.error.fragmentwithtype=
jsp.error.fragmentWithDeclareOrScope=
-jsp.error.invoke.varAndVarReader=
-jsp.error.doBody.varAndVarReader=
+jsp.error.var_and_varReader=
jsp.warning.bad.urlpattern.propertygroup=
jsp.error.jspelement.missing.name=
jsp.error.tagdirective.badbodycontent=
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
