kinman 2003/06/19 14:06:31 Modified: jasper2/src/share/org/apache/jasper/compiler Validator.java jasper2/src/share/org/apache/jasper/resources messages.properties Log: - Fix 20894: body-content value of "JSP" should be error if SimpleTag Revision Changes Path 1.108 +12 -3 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.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- Validator.java 11 May 2003 22:54:47 -0000 1.107 +++ Validator.java 19 Jun 2003 21:06:30 -0000 1.108 @@ -709,6 +709,15 @@ } /* + * The bodyconet of a SimpleTag cannot be JSP. + */ + if (n.implementsSimpleTag() && + tagInfo.getBodyContent().equalsIgnoreCase(TagInfo.BODY_CONTENT_JSP)) { + err.jspError(n, "jsp.error.simpletag.badbodycontent", + tagInfo.getTagClassName()); + } + + /* * If the tag handler declares in the TLD that it supports dynamic * attributes, it also must implement the DynamicAttributes * interface. 1.118 +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.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- messages.properties 3 May 2003 02:36:13 -0000 1.117 +++ messages.properties 19 Jun 2003 21:06:30 -0000 1.118 @@ -309,6 +309,7 @@ jsp.error.badStandardAction=Invalid standard action jsp.error.xml.badStandardAction=Invalid standard action: {0} jsp.error.tagdirective.badbodycontent=Invalid body-content ({0}) in tag directive +jsp.error.simpletag.badbodycontent=The TLD for the class {0} specifies an invalid body-content (JSP) for a SimpleTag. jsp.error.config_pagedir_encoding_mismatch=Page-encoding specified in jsp-property-group ({0}) is different from that specified in page directive ({1}) jsp.error.prolog_pagedir_encoding_mismatch=Page-encoding specified in XML prolog ({0}) is different from that specified in page directive ({1}) jsp.error.prolog_config_encoding_mismatch=Page-encoding specified in XML prolog ({0}) is different from that specified in jsp-property-group ({1})
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]