kinman 2003/01/27 16:19:10
Modified: jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
jsr152/src/share/javax/servlet/jsp/el
ExpressionEvaluator.java FunctionMapper.java
jsr152/src/share/javax/servlet/jsp/tagext SimpleTag.java
jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd
Log:
- Patch by Mark Roth:
Final API patch before PFD2 release of JSP 2.0 specification.
jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Updated description for function-signature element
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Updated description for function-signature element
jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java
- Changed description of prefix parameter to resolveFunction
("" means no prefix)
jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
- Changed description of defaultPrefix parameter to resolveFunction
("" means the default is no prefix)
- Changed description of defaultPrefix parameter to evaluate
("" means the default is no prefix)
jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
- Changed javadocs for setJspBody(). null is no longer passed
if the body is empty. Instead, setJspBody() is not called.
Revision Changes Path
1.7 +27 -6
jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
Index: web-jsptaglibrary_2_0.xsd
===================================================================
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- web-jsptaglibrary_2_0.xsd 8 Nov 2002 21:30:20 -0000 1.6
+++ web-jsptaglibrary_2_0.xsd 28 Jan 2003 00:19:10 -0000 1.7
@@ -10,7 +10,7 @@
<xsd:annotation>
<xsd:documentation>
-@(#)web-jsptaglibrary_2_0.xsds 1.24 11/01/02
+@(#)web-jsptaglibrary_2_0.xsds 1.26 01/24/03
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -52,8 +52,8 @@
<xsd:documentation>
<![CDATA[
-This is the XML Schema for the JSP Taglibrary deployment
-descriptor. All Taglibrary deployment descriptors must
+This is the XML Schema for the JSP Taglibrary
+descriptor. All Taglibrary descriptors must
indicate the tag library schema by using the Taglibrary
namespace:
@@ -243,9 +243,30 @@
<xsd:annotation>
<xsd:documentation>
- Provides the signature, as in the Java Language
- Specification, of the static Java method that is
- to be used to implement the function.
+ Provides the signature, of the static Java method that is
+ to be used to implement the function. The syntax of the
+ function-signature element is as follows:
+
+ FunctionSignature ::= ReturnType S MethodName S?
+ '(' S? Parameters? S? ')'
+
+ ReturnType ::= ClassName
+
+ MethodName ::= Identifier
+
+ Parameters ::= Parameter
+ | ( Parameter S? ',' S? Parameters )
+
+ Parameter ::= ClassName
+
+ Where:
+
+ * ClassName is a fully qualified Java class name
+ (including package name), as per the Java Language
+ Specification.
+
+ * Identifier is a Java identifier as per the Java
+ Language Specification.
Example:
1.7 +2 -2
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
Index: ExpressionEvaluator.java
===================================================================
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExpressionEvaluator.java 18 Dec 2002 18:35:37 -0000 1.6
+++ ExpressionEvaluator.java 28 Jan 2003 00:19:10 -0000 1.7
@@ -104,7 +104,7 @@
* evaluating it, and must return a consistent value each time
* it is invoked.
* @param defaultPrefix The default prefix to use when a function is
- * encountered with no prefix.
+ * encountered with no prefix, or "" if the default is no prefix.
* @return The Expression object encapsulating the arguments.
*
* @exception ELException Thrown if parsing errors were found.
@@ -133,7 +133,7 @@
* evaluating it, and must return a consistent value each time
* it is invoked.
* @param defaultPrefix The default prefix to use when a function is
- * encountered with no prefix.
+ * encountered with no prefix, or "" if the default is no prefix.
* @return The result of the expression evaluation.
*
* @exception ELException Thrown if the expression evaluation failed.
1.3 +4 -9
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java
Index: FunctionMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/FunctionMapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FunctionMapper.java 29 Oct 2002 01:18:12 -0000 1.2
+++ FunctionMapper.java 28 Jan 2003 00:19:10 -0000 1.3
@@ -63,20 +63,15 @@
*
* @since 2.0
*/
-public interface FunctionMapper
-{
- //-------------------------------------
+public interface FunctionMapper {
/**
* Resolves the specified local name and prefix into a Java.lang.Method.
* Returns null if the prefix and local name are not found.
*
- * @param prefix the prefix of the function
+ * @param prefix the prefix of the function, or "" if no prefix.
* @param localName the short name of the function
* @return the result of the method mapping. Null means no entry found.
**/
- public java.lang.reflect.Method resolveFunction(String prefix,
- String localName);
-
-
- //-------------------------------------
+ public java.lang.reflect.Method resolveFunction(String prefix,
+ String localName);
}
1.6 +4 -4
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
Index: SimpleTag.java
===================================================================
RCS file:
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SimpleTag.java 18 Dec 2002 18:35:37 -0000 1.5
+++ SimpleTag.java 28 Jan 2003 00:19:10 -0000 1.6
@@ -93,8 +93,9 @@
* <li>The setters for each attribute defined for this tag are called
* by the container, in the order in which they appear in the JSP
* page or Tag File.</li>
- * <li>The <code>setJspBody()</code> method is called by the container
- * to set the body of this tag, as a <code>JspFragment</code>.</li>
+ * <li>If a body exists, the <code>setJspBody()</code> method is called
+ * by the container to set the body of this tag, as a
+ * <code>JspFragment</code>.</li>
* <li>The <code>doTag()</code> method is called by the container. All
* tag logic, iteration, body evaluations, etc. occur in this
* method.</li>
@@ -162,8 +163,7 @@
* This method is invoked by the JSP page implementation
* object prior to <code>doTag()</code>.
*
- * @param jspBody The fragment encapsulating the body of this tag, or
- * null if this tag as a body content type of empty.
+ * @param jspBody The fragment encapsulating the body of this tag.
*/
public void setJspBody( JspFragment jspBody );
1.7 +27 -6
jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
Index: web-jsptaglibrary_2_0.xsd
===================================================================
RCS file:
/home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- web-jsptaglibrary_2_0.xsd 8 Nov 2002 21:30:21 -0000 1.6
+++ web-jsptaglibrary_2_0.xsd 28 Jan 2003 00:19:10 -0000 1.7
@@ -10,7 +10,7 @@
<xsd:annotation>
<xsd:documentation>
-@(#)web-jsptaglibrary_2_0.xsds 1.24 11/01/02
+@(#)web-jsptaglibrary_2_0.xsds 1.26 01/24/03
</xsd:documentation>
</xsd:annotation>
<xsd:annotation>
@@ -52,8 +52,8 @@
<xsd:documentation>
<![CDATA[
-This is the XML Schema for the JSP Taglibrary deployment
-descriptor. All Taglibrary deployment descriptors must
+This is the XML Schema for the JSP Taglibrary
+descriptor. All Taglibrary descriptors must
indicate the tag library schema by using the Taglibrary
namespace:
@@ -243,9 +243,30 @@
<xsd:annotation>
<xsd:documentation>
- Provides the signature, as in the Java Language
- Specification, of the static Java method that is
- to be used to implement the function.
+ Provides the signature, of the static Java method that is
+ to be used to implement the function. The syntax of the
+ function-signature element is as follows:
+
+ FunctionSignature ::= ReturnType S MethodName S?
+ '(' S? Parameters? S? ')'
+
+ ReturnType ::= ClassName
+
+ MethodName ::= Identifier
+
+ Parameters ::= Parameter
+ | ( Parameter S? ',' S? Parameters )
+
+ Parameter ::= ClassName
+
+ Where:
+
+ * ClassName is a fully qualified Java class name
+ (including package name), as per the Java Language
+ Specification.
+
+ * Identifier is a Java identifier as per the Java
+ Language Specification.
Example:
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
