kinman 2003/01/10 10:17:03
Modified: jsr152/src/share/dtd jsp_2_0.xsd
jsr152/src/share/javax/servlet/jsp/tagext TagInfo.java
VariableInfo.java
jsr154/src/share/dtd jsp_2_0.xsd
Log:
- Patch by Mark Roth:
Fixes leading up to the second proposed final draft
release of the specification.
jsr152/src/share/dtd/jsp_2_0.xsd
- Updated comments for jsp-property-groupType
jsr154/src/share/dtd/jsp_2_0.xsd
- Updated comments for jsp-property-groupType
jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
- Fixed typo: 'the the'
jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
- Fixed typo: 'AT_NESTED' --> 'NESTED'
- Fixed table - AT_BEGIN and NESTED should be synchronized
after doStartTag() if EVAL_BODY_INCLUDE is returned.
Revision Changes Path
1.6 +4 -4 jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd
Index: jsp_2_0.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jsp_2_0.xsd 8 Nov 2002 21:30:20 -0000 1.5
+++ jsp_2_0.xsd 10 Jan 2003 18:17:02 -0000 1.6
@@ -8,7 +8,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
-@(#)jsp_2_0.xsds 1.14 11/06/02
+@(#)jsp_2_0.xsds 1.15 01/02/03
</xsd:documentation>
</xsd:annotation>
@@ -136,10 +136,10 @@
All files so described are deemed to be JSP files. The
following additional properties can be described:
- - Control enabling of EL evaluation.
- - Control enabling of Scripting elements.
+ - Control whether EL is ignored
+ - Control whether scripting elements are invalid
- Indicate pageEncoding information.
- - Indicating that a resource is a JSP document
+ - Indicate that a resource is a JSP document (XML)
- Prelude and Coda automatic includes.
</xsd:documentation>
1.5 +1 -1
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
Index: TagInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TagInfo.java 4 Nov 2002 17:44:24 -0000 1.4
+++ TagInfo.java 10 Jan 2003 18:17:02 -0000 1.5
@@ -268,7 +268,7 @@
*
* @param data TagData describing this action.
* @return if a TagExtraInfo object is associated with this TagInfo, the
- * the result of getTagExtraInfo().getVariableInfo( data ), otherwise
+ * result of getTagExtraInfo().getVariableInfo( data ), otherwise
* null if the tag has no "id" attribute or new VariableInfo[] {
* new VariableInfo( data.getId(), "java.lang.Object", true,
* VariableInfo.NESTED ) } if an "id" attribute is present.
1.7 +5 -2
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
Index: VariableInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VariableInfo.java 18 Dec 2002 18:35:37 -0000 1.6
+++ VariableInfo.java 10 Jan 2003 18:17:02 -0000 1.7
@@ -193,9 +193,9 @@
* <tr>
* <td valign="top" bgcolor="#c0c0c0"><b>BodyTag<br>
* </b></td>
- * <td valign="top" align="center" bgcolor="#ffffff"><br>
+ * <td valign="top" align="center" bgcolor="#ffffff">AT_BEGIN,
NESTED<sup>1</sup><br>
* </td>
- * <td valign="top" align="center" bgcolor="#ffffff">AT_BEGIN, AT_NESTED<br>
+ * <td valign="top" align="center" bgcolor="#ffffff">AT_BEGIN,
NESTED<sup>1</sup><br>
* </td>
* <td valign="top" align="center" bgcolor="#ffffff">AT_BEGIN, NESTED<br>
* </td>
@@ -220,6 +220,9 @@
* </tr>
* </tbody>
* </table>
+ * <sup>1</sup> Called after <code>doStartTag()</code> if
+ * <code>EVAL_BODY_INCLUDE</code> is returned, or after
+ * <code>doInitBody()</code> otherwise.
* </blockquote>
*
* <p><B>Variable Information in the TLD</B>
1.6 +4 -4 jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd
Index: jsp_2_0.xsd
===================================================================
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jsp_2_0.xsd 8 Nov 2002 21:30:21 -0000 1.5
+++ jsp_2_0.xsd 10 Jan 2003 18:17:03 -0000 1.6
@@ -8,7 +8,7 @@
version="2.0">
<xsd:annotation>
<xsd:documentation>
-@(#)jsp_2_0.xsds 1.14 11/06/02
+@(#)jsp_2_0.xsds 1.15 01/02/03
</xsd:documentation>
</xsd:annotation>
@@ -136,10 +136,10 @@
All files so described are deemed to be JSP files. The
following additional properties can be described:
- - Control enabling of EL evaluation.
- - Control enabling of Scripting elements.
+ - Control whether EL is ignored
+ - Control whether scripting elements are invalid
- Indicate pageEncoding information.
- - Indicating that a resource is a JSP document
+ - Indicate that a resource is a JSP document (XML)
- Prelude and Coda automatic includes.
</xsd:documentation>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
