luehe 2002/10/08 16:42:07
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Parser.java
jasper2/src/share/org/apache/jasper/resources Tag:
tomcat_4_branch messages.properties
messages_es.properties messages_ja.properties
Log:
Added error message for jasper.error.emptybodycontent.nonempty
Revision Changes Path
No revision
No revision
1.7.2.3 +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.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- Parser.java 17 Aug 2002 00:14:23 -0000 1.7.2.2
+++ Parser.java 8 Oct 2002 23:42:06 -0000 1.7.2.3
@@ -747,7 +747,8 @@
// There are 3 body content types: empty, jsp, or tag-dependent.
if (bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_EMPTY)) {
if (!reader.matchesETag(tagName)) {
- err.jspError(start, "jasper.error.emptybodycontent.nonempty");
+ err.jspError(start, "jasper.error.emptybodycontent.nonempty",
+ tagName);
}
} else if (bc.equalsIgnoreCase(TagInfo.BODY_CONTENT_TAG_DEPENDENT)) {
// parse the body as text
No revision
No revision
1.9.2.3 +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.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- messages.properties 21 Aug 2002 17:54:24 -0000 1.9.2.2
+++ messages.properties 8 Oct 2002 23:42:06 -0000 1.9.2.3
@@ -251,3 +251,4 @@
jsp.error.single.line.number=\n\nAn error occurred at line: {0} in the jsp file:
{1}\n\n
jsp.error.multiple.line.number=\n\nAn error occurred between lines: {0} and {1} in
the jsp file: {2}\n\n
jsp.error.corresponding.servlet=Generated servlet error:\n
+jasper.error.emptybodycontent.nonempty=According to TLD, tag {0} must be empty, but
is not
1.3.2.2 +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.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- messages_es.properties 18 Jul 2002 23:25:05 -0000 1.3.2.1
+++ messages_es.properties 8 Oct 2002 23:42:06 -0000 1.3.2.2
@@ -207,3 +207,4 @@
jsp.error.internal.filenotfound=
jsp.error.parse.xml.invalidPublicId=
jsp.error.usebean.notinsamefile=El tag useBean debe empezar y acabar en el mismo
archivo fisico
+jasper.error.emptybodycontent.nonempty=
1.2.2.1 +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.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- messages_ja.properties 26 Jun 2002 16:50:38 -0000 1.2
+++ messages_ja.properties 8 Oct 2002 23:42:06 -0000 1.2.2.1
@@ -241,3 +241,4 @@
jsp.error.single.line.number=\n\nJSP\u30d5\u30a1\u30a4\u30eb: {1}
\u306e\u4e2d\u306e\u884c:
{0}\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\n\n
jsp.error.multiple.line.number=\n\nJPS\u30d5\u30a1\u30a4\u30eb:
{2}\u306e\u4e2d\u306e{0}\u884c\u76ee\u3068{1}\u884c\u76ee\u306e\u9593\u3067\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\n\n
jsp.error.corresponding.servlet=\u751f\u6210\u3055\u308c\u305f\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306e\u30a8\u30e9\u30fc\u3067\u3059:\n
+jasper.error.emptybodycontent.nonempty=
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
