[PATCH] jakarta-servletapi-5 API Changes

2003-08-26 Thread Mark Roth
jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
- Fixed incorrect clarification of getVariableInfo().  The original
  semantics requiring special treatment of the id attribute
  were supposed to have been removed in JSP 1.2.  We brought them
  back to life in JSP 2.0, but the right thing to do was to remove
  them altogether, as no containers implemented them anyway.
jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
- Clarified that the URI passed to validate() is the same as
  the URI in the XML View, not the uri passed to the taglib
  directive (which doesn't always exist or produce consistent
  results)
---
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java,v
retrieving revision 1.7
diff -u -r1.7 TagInfo.java
--- jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  8 Aug 2003 22:27:40 
-   1.7
+++ jsr152/src/share/javax/servlet/jsp/tagext/TagInfo.java  25 Aug 2003 20:15:19 
-
@@ -268,25 +268,13 @@
  * @param data TagData describing this action.
  * @return if a TagExtraInfo object is associated with this TagInfo, the
  * 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.
+ * null.
  */
public VariableInfo[] getVariableInfo(TagData data) {
VariableInfo[] result = null;
TagExtraInfo tei = getTagExtraInfo();
if (tei != null) {
   result = tei.getVariableInfo( data );
-   }
-   else {
-  String idValue = data.getId();
-  if( idValue != null ) {
-  result = 
-  new VariableInfo[] {
-  new VariableInfo( idValue, java.lang.Object,
-  true, VariableInfo.NESTED )
-  };
-  }
}
return result;
}
Index: jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java
===
RCS file: 
/home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java,v
retrieving revision 1.6
diff -u -r1.6 TagLibraryValidator.java
--- jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java  14 Apr 2003 
17:36:39 -  1.6
+++ jsr152/src/share/javax/servlet/jsp/tagext/TagLibraryValidator.java  25 Aug 2003 
20:15:19 -
@@ -76,7 +76,7 @@
  *
  * once initialized, the validate(String, String, PageData) method will
  * be invoked, where the first two arguments are the prefix
- * and uri arguments used in the taglib directive.  The prefix is intended
+ * and uri for this tag library in the XML View.  The prefix is intended
  * to make it easier to produce an error message.  However, it is not
  * always accurate.  In the case where a single URI is mapped to more 
  * than one prefix in the XML view, the prefix of the first URI is provided.

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

[PATCH] jakarta-servletapi-5: API changes and clarifications

2002-11-08 Thread Mark Roth
Here is another set of JSP 2.0 API changes and clarifications, based on 
feedback from various sources.  Please let me know if there are any 
questions or concerns.

jsr152/src/share/javax/servlet/jsp/JspContext.java
  - Clarified that removeAttribute( name ) removes from all scopes
  - Clarified that removeAttribute( name, scope ) does nothing if the
object doesn't exist in that scope.
  - Clarified that setAttribute( name, null ) has the effect of removing
that attribute from the page scope.
  - Clarified that setAttribute( name, null, scope ) has the effect of
removing that attribute from the given scope.

jsr152/src/share/javax/servlet/jsp/tagext/TagSupport.java
  - Clarified javadocs for getValues() that the keys are returned.
  - Updated release() method to clear id and values Hashtable

jsr152/src/share/javax/servlet/jsp/tagext/PageData.java
  - Clarified the InputStream returned is in UTF-8

jsr152/src/share/dtd/jspxml.dtd
jsr152/src/share/dtd/jspxml.xsd
jsr154/src/share/dtd/jspxml.dtd
jsr154/src/share/dtd/jspxml.xsd
  - Removed i18n-related comment about contentType default

jsr152/src/share/dtd/jsp_2_0.xsd
jsr154/src/share/dtd/jsp_2_0.xsd
  - Changed i18n-related description relating to encoding name conflicts

jsr154/src/share/dtd/web-app_2_4.xsd
jsr154/src/share/dtd/j2ee_1_4.xsd
  - Moved warType from j2ee_1_4.xsd to web-app_2_4.xsd

--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/dtd/jsp_2_0.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jsp_2_0.xsd,v
retrieving revision 1.4
diff -u -r1.4 jsp_2_0.xsd
--- jsr152/src/share/dtd/jsp_2_0.xsd9 Oct 2002 17:38:49 -   1.4
+++ jsr152/src/share/dtd/jsp_2_0.xsd8 Nov 2002 21:16:38 -
 -8,7 +8,7 
  version=2.0
 xsd:annotation
 xsd:documentation
-%W% %G%
+(#)jsp_2_0.xsds   1.14 11/06/02
 /xsd:documentation
 /xsd:annotation
 
 -172,12 +172,15 
 xsd:documentation
 
 The valid values of page-encoding are those of the
-pageEncoding page directive. It is a
-translation-time error to define the pageEncoding
-of a JSP page through one value in the JSP
-configuration element and then give it a different
-value in a pageEncoding directive, but it is legal
-to give it the same value.
+pageEncoding page directive.  It is a
+   translation-time error to name different encodings
+   in the pageEncoding attribute of the page directive
+   of a JSP page and in a JSP configuration element
+   matching the page.  It is also a translation-time
+   error to name different encodings in the prolog of
+   a document in XML syntax and in a JSP configuration
+   element matching the document.  It is legal to name
+   the same encoding through mulitple mechanisms.
 
 /xsd:documentation
 /xsd:annotation
Index: jsr152/src/share/dtd/jspxml.dtd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.dtd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 jspxml.dtd
--- jsr152/src/share/dtd/jspxml.dtd 13 Aug 2002 16:20:58 -  1.1.1.1
+++ jsr152/src/share/dtd/jspxml.dtd 8 Nov 2002 21:16:38 -
 -1,4 +1,4 
-!-- DTD for JSP 1.2
+!-- DTD for JSP 2.0
  thanks to Bob Foster, WebGain
 --
 
 -77,12 +77,6 
 
 
 !ELEMENT jsp:directive.page EMPTY
-!--
-The contentType default is not relevant for XML views of
-JSP pages since it differs depending on the originating
-syntax (text/html;ISO-8859-1 for JSP Pages in standard syntax, or
-text/xml;UTF-8 for JSP Documents in XML syntax.
---
 !ATTLIST jsp:directive.page
 languageCDATA   java
 extends %ClassName; #IMPLIED
 -96,8 +90,7 
 errorPage   %URL;   #IMPLIED
 isErrorPage %Bool;  false
 pageEncodingCDATA   #IMPLIED
-isScriptingEnabled %Bool;   true
-isELEnabled %Bool;  #IMPLIED
+isELIgnored %Bool;  #IMPLIED
 
 
 !-- the jsp:directive.include only appears in JSP documents and does
Index: jsr152/src/share/dtd/jspxml.xsd
===
RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.xsd,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 jspxml.xsd
--- jsr152/src/share/dtd/jspxml.xsd 13 Aug 2002 16:20:58 -  1.1.1.1
+++ jsr152/src/share/dtd/jspxml.xsd 8 Nov 2002 21:16:57 -
 -29,7 +29,7 
 
   xsd:annotation
 xsd:documentation
-  XML Schema for JSP 1.2.
+  XML Schema for JSP 2.0.
 
   This schema is based upon the recent (May 5th, 2001)
   W3C recommendation for XML Schema.
 -210,7 +210,7 
   xsd:simpleType name = ContentType
 xsd:annotation
   xsd:documentation
-Contetn Type for this