cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd

2003-08-18 Thread kinman 
kinman  2003/08/18 12:58:19

  Modified:jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
   jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd
  Log:
  - Patch by Mark Roth
  
  Slight additional clarification to TLD.
  
  jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
  jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
   - Clarified that body-content is not just a hint
   - Reformatted description for body-content with smaller margins
 for spec
  
  Revision  ChangesPath
  1.14  +10 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- web-jsptaglibrary_2_0.xsd 18 Aug 2003 17:41:20 -  1.13
  +++ web-jsptaglibrary_2_0.xsd 18 Aug 2003 19:58:19 -  1.14
  @@ -131,8 +131,11 @@
   xsd:annotation
 xsd:documentation
   
  - Provides a hint as to the content of the body of this tag.
  - Primarily intended for use by page composition tools.
  +Specifies the type of body that is valid for a tag.
  + This value is used by the JSP container to validate
  + that a tag invocation has the correct body syntax and
  + by page composition tools to assist the page author
  + in providing a valid tag body.
   
There are currently four values specified:
   
  @@ -477,10 +480,11 @@
  xsd:documentation
   
Specifies the format for the body of this tag.
  - The default in JSP 1.2 was JSP but because this is an invalid
  - setting for simple tag handlers, there is no longer a default
  - in JSP 2.0.  A reasonable default for simple tag handlers is
  - scriptless if the tag can have a body.
  + The default in JSP 1.2 was JSP but because this
  + is an invalid setting for simple tag handlers, there
  + is no longer a default in JSP 2.0.  A reasonable
  + default for simple tag handlers is scriptless if
  + the tag can have a body.
   
  /xsd:documentation
/xsd:annotation
  
  
  
  1.14  +10 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- web-jsptaglibrary_2_0.xsd 18 Aug 2003 17:41:20 -  1.13
  +++ web-jsptaglibrary_2_0.xsd 18 Aug 2003 19:58:19 -  1.14
  @@ -131,8 +131,11 @@
   xsd:annotation
 xsd:documentation
   
  - Provides a hint as to the content of the body of this tag.
  - Primarily intended for use by page composition tools.
  +Specifies the type of body that is valid for a tag.
  + This value is used by the JSP container to validate
  + that a tag invocation has the correct body syntax and
  + by page composition tools to assist the page author
  + in providing a valid tag body.
   
There are currently four values specified:
   
  @@ -477,10 +480,11 @@
  xsd:documentation
   
Specifies the format for the body of this tag.
  - The default in JSP 1.2 was JSP but because this is an invalid
  - setting for simple tag handlers, there is no longer a default
  - in JSP 2.0.  A reasonable default for simple tag handlers is
  - scriptless if the tag can have a body.
  + The default in JSP 1.2 was JSP but because this
  + is an invalid setting for simple tag handlers, there
  + is no longer a default in JSP 2.0.  A reasonable
  + default for simple tag handlers is scriptless if
  + the tag can have a body.
   
  /xsd:documentation
/xsd:annotation
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd

2003-03-03 Thread kinman 
kinman  2003/03/03 16:17:05

  Modified:jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
   jsr152/src/share/javax/servlet/jsp JspContext.java
   jsr152/src/share/javax/servlet/jsp/el
ExpressionEvaluator.java
   jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd
  Log:
  - Patch by Mark Roth
  
  /jsr152/src/share/javax/servlet/jsp/JspContext.java:
   - Added throws clause for NullPointerException for null
 name parameter to the following methods:
 findAttribute( name )
 removeAttribute( name )
 removeAttribute( name, scope )
 getAttributesScope( name )
  
  /jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java
   - We now allow null to be passed for defaultPrefix for cases where
 a function must have a prefix.
  
  /jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
  /jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
   - Updated part of the description of the taglib element
 Before:
   The taglib element contains tag elements.
 After:
   The taglib element contains, among other
   things, tag and tag-file elements.
   - Removed tag-file-name-uniqueness constraint
   - Upgraded tag-name-uniqueness constraint to check
 uniqueness across both tag and tag-file elements.
 (Xerces has a bug that causes this not to work, yet
 but this should work, according to Kohsuke and
 Norm)
   - langage -- language
   - Removed uppercase versions of body-content types,
 TAGDEPENDENT, EMPTY, and SCRIPTLESS
   - Renamed j2ee:tag-extensionType to
 j2ee:tld-extensionType
   - Removed references to old mustUnderstand attribute
   - Added function-extension element for extension of
 function elements in addition to taglib and tag
 elements.
  
  Revision  ChangesPath
  1.10  +63 -73
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- web-jsptaglibrary_2_0.xsd 14 Feb 2003 19:34:43 -  1.9
  +++ web-jsptaglibrary_2_0.xsd 4 Mar 2003 00:17:04 -   1.10
  @@ -10,7 +10,7 @@
   
 xsd:annotation
   xsd:documentation
  -  @(#)web-jsptaglibrary_2_0.xsds 1.31 02/11/03
  +  @(#)web-jsptaglibrary_2_0.xsds 1.32 03/02/03
   /xsd:documentation
 /xsd:annotation
 xsd:annotation
  @@ -99,25 +99,13 @@
 xsd:annotation
xsd:documentation
   
  -   The taglib element contains tag elements.
  +   The taglib element contains, among other things, tag and
  +   tag-file elements.
  The name subelements of these elements must each be unique.
   
/xsd:documentation
 /xsd:annotation
  -  xsd:selector xpath=j2ee:tag/
  -  xsd:fieldxpath=j2ee:name/
  -/xsd:unique
  -
  -xsd:unique name=tag-file-name-uniqueness
  -  xsd:annotation
  - xsd:documentation
  -
  -   The taglib element contains tag-file elements.
  -   The name subelements of these elements must each be unique.
  -
  - /xsd:documentation
  -  /xsd:annotation
  -  xsd:selector xpath=j2ee:tag-file/
  +  xsd:selector xpath=j2ee:tag|j2ee:tag-file/
 xsd:fieldxpath=j2ee:name/
   /xsd:unique
   
  @@ -150,7 +138,7 @@
   
tagdependentThe body of the tag is interpreted by the tag
implementation itself, and is most likely
  - in a different langage, e.g embedded SQL
  + in a different language, e.g embedded SQL
statements.
   
JSP The body of the tag contains nested JSP
  @@ -168,12 +156,9 @@
   xsd:simpleContent
 xsd:restriction base=j2ee:string
xsd:enumeration value=tagdependent/
  - xsd:enumeration value=TAGDEPENDENT/
xsd:enumeration value=JSP/
xsd:enumeration value=empty/
  - xsd:enumeration value=EMPTY/
xsd:enumeration value=scriptless/
  - xsd:enumeration value=SCRIPTLESS/
 /xsd:restriction
   /xsd:simpleContent
 /xsd:complexType
  @@ -227,6 +212,10 @@
example Optional informal description of an
example of a use of this function
   
  + function-extension  Zero or more extensions that provide extra
  + information about this function, for tool
  + consumption
  +
 /xsd:documentation
   /xsd:annotation
   
  @@ -308,6 +297,19 @@
/xsd:annotation
   
 /xsd:element
  +  xsd:element name=function-extension
  +type=j2ee:tld-extensionType
  +

cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd

2003-01-27 Thread kinman 
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  ChangesPath
  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 -   1.6
  +++ web-jsptaglibrary_2_0.xsd 28 Jan 2003 00:19:10 -  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 -  1.6
  +++ ExpressionEvaluator.java  28 Jan 2003 00:19:10 -  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.

cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd

2002-11-04 Thread kinman 
kinman  2002/11/04 09:44:25

  Modified:jsr152/src/share/javax/servlet/jsp/tagext BodyTag.java
IterationTag.java SimpleTag.java Tag.java
TagData.java TagExtraInfo.java TagInfo.java
VariableInfo.java
   jsr154/src/share/dtd web-jsptaglibrary_2_0.xsd
  Log:
  - Patch by Mark Roth
  
  Here is a patch with some more javadoc clarifications, to make the API
  more testable.  Thanks go to Ryan Lubke for helping out!
  
  Change summary:
  ---
  
  jsr152/src/share/javax/servlet/jsp/tagext/VariableInfo.java
 - Fixed incorrect wording from last patch, for variable
   synchronization.
  
  jsr152/src/share/javax/servlet/jsp/tagext/TagExtraInfo.java
 - Fixed wording to preserve forwards compatibility for existing TEI
   implementations.
  
  jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
 - Fixed default implementation of getVariableInfo() to return a
   variable for the id attribute, if specified.
   Clarified intent in javadocs.
  
  jsr152/src/share/javax/servlet/jsp/tagext/TagData.java
 - Fixed getId() description, as we're not returning the jsp:id in this
   case.
  
  jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
  jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
  jsr152/src/share/javax/servlet/jsp/tagext/SimpleTag.java
  jsr152/src/share/javax/servlet/jsp/tagext/Tag.java
 - Clarified javadocs w.r.t. variable synchronization
  
  jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
  jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
 - Removed fragment element under variable element, as fragment-scoped
   variables are no longer supported.
  
  Revision  ChangesPath
  1.3   +3 -3  
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java
  
  Index: BodyTag.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/BodyTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BodyTag.java  29 Oct 2002 01:18:12 -  1.2
  +++ BodyTag.java  4 Nov 2002 17:44:24 -   1.3
   -200,9 +200,9 
* tags whose doStartTag() method returns SKIP_BODY or EVAL_BODY_INCLUDE.
*
* p
  - * The JSP container will resynchronize any variable values that 
  - * are indicated as so in TagExtraInfo or TLD after the invocation of 
  - * doInitBody().
  + * The JSP container will resynchronize the values of any AT_BEGIN and
  + * NESTED variables (defined by the associated TagExtraInfo or TLD) after
  + * the invocation of doInitBody().
*
* throws JspException
* see #doAfterBody
  
  
  
  1.3   +3 -3  
jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java
  
  Index: IterationTag.java
  ===
  RCS file: 
/home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/IterationTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IterationTag.java 29 Oct 2002 01:18:12 -  1.2
  +++ IterationTag.java 4 Nov 2002 17:44:24 -   1.3
   -138,9 +138,9 
* of external computation.
*
* p
  - * The JSP container will resynchronize any variable values that are 
  - * indicated as so in TagExtraInfo or TLD after the invocation of 
  - * doAfterBody().
  + * The JSP container will resynchronize the values of any AT_BEGIN and
  + * NESTED variables (defined by the associated TagExtraInfo or TLD) after
  + * the invocation of doAfterBody().
*
* return whether additional evaluations of the body are desired
* throws JspException
  
  
  
  1.4   +5 -0  
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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SimpleTag.java29 Oct 2002 01:18:12 -  1.3
  +++ SimpleTag.java4 Nov 2002 17:44:24 -   1.4
   -111,6 +111,11 
* Called by the container to invoke this tag.
* The implementation of this method is provided by the tag library
* developer, and handles all tag processing, body iteration, etc.
  + *
  + * p
  + * The JSP container will resynchronize any AT_BEGIN and AT_END
  + * variables (defined by the associated tag file, TagExtraInfo, or TLD)
  + * after the invocation of doTag().
* 
* throws javax.servlet.jsp.JspException If an error occurred 
* while processing this tag.
  
  
  
  1.4   +8 -6