luehe 2003/08/15 14:01:41
Modified: jasper2/src/share/org/apache/jasper/compiler
TagLibraryInfoImpl.java
Log:
Restored JSP default for 1.2 based tag handlers
Revision Changes Path
1.44 +11 -19
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- TagLibraryInfoImpl.java 24 Jul 2003 01:17:33 -0000 1.43
+++ TagLibraryInfoImpl.java 15 Aug 2003 21:01:41 -0000 1.44
@@ -370,7 +370,14 @@
String tagName = null;
String tagClassName = null;
String teiClassName = null;
- String bodycontent = null;
+
+ /*
+ * Default body content for JSP 1.2 tag handlers (<body-content> has
+ * become mandatory in JSP 2.0, because the default would be invalid
+ * for simple tag handlers)
+ */
+ String bodycontent = "JSP";
+
String info = null;
String displayName = null;
String smallIcon = null;
@@ -420,21 +427,6 @@
tname));
}
}
- }
-
- // Determine appropriate default value for body-content
- if (bodycontent == null) {
- try {
- Class tagClass = ctxt.getClassLoader().loadClass(tagClassName);
- if (SimpleTag.class.isAssignableFrom(tagClass)) {
- bodycontent = TagInfo.BODY_CONTENT_SCRIPTLESS;
- } else {
- bodycontent = TagInfo.BODY_CONTENT_JSP;
- }
- } catch (Exception e) {
- err.jspError("jsp.error.loadclass.taghandler", tagClassName,
- tagName);
- }
}
TagExtraInfo tei = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
