luehe 2002/10/08 16:22:58
Modified: jasper2/src/share/org/apache/jasper/compiler Parser.java
jasper2/src/share/org/apache/jasper/resources
messages.properties messages_es.properties
messages_ja.properties
Log:
Added error message for jasper.error.emptybodycontent.nonempty
Revision Changes Path
1.33 +5 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java
Index: Parser.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Parser.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Parser.java 28 Sep 2002 00:46:28 -0000 1.32
+++ Parser.java 8 Oct 2002 23:22:57 -0000 1.33
@@ -1611,7 +1611,8 @@
}
else if( bodyType.equalsIgnoreCase( TagInfo.BODY_CONTENT_EMPTY ) ) {
if( !reader.matchesETag( tag ) ) {
- err.jspError(start, "jasper.error.emptybodycontent.nonempty");
+ err.jspError(start, "jasper.error.emptybodycontent.nonempty",
+ tag);
}
}
else if( bodyType == JAVAX_BODY_CONTENT_PLUGIN ) {
1.44 +2 -1
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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- messages.properties 27 Sep 2002 20:18:32 -0000 1.43
+++ messages.properties 8 Oct 2002 23:22:57 -0000 1.44
@@ -303,3 +303,4 @@
jsp.error.page.pageencoding.conflict=Page-encoding specified in jsp-property-group
({0}) is different from that specified in page directive ({1})
jsp.error.attribute.non_rt_with_expr=According to TLD, attribute {0} does not
accept any expressions
jsp.error.scripting.variable.missing_name=Unable to determine scripting variable
name from attribute {0}
+jasper.error.emptybodycontent.nonempty=According to TLD, tag {0} must be empty, but
is not
1.15 +2 -1
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- messages_es.properties 24 Sep 2002 21:24:58 -0000 1.14
+++ messages_es.properties 8 Oct 2002 23:22:57 -0000 1.15
@@ -223,3 +223,4 @@
jsp.error.page.pageencoding.conflict=
jsp.error.attribute.non_rt_with_expr=
jsp.error.scripting.variable.missing_name=
+jasper.error.emptybodycontent.nonempty=
1.15 +2 -1
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- messages_ja.properties 27 Sep 2002 20:18:32 -0000 1.14
+++ messages_ja.properties 8 Oct 2002 23:22:57 -0000 1.15
@@ -254,3 +254,4 @@
jsp.error.page.pageencoding.conflict=
jsp.error.attribute.non_rt_with_expr=
jsp.error.scripting.variable.missing_name=
+jasper.error.emptybodycontent.nonempty=
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
