cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd j2ee_1_4.xsd
kinman 2003/09/25 15:33:18 Modified:jsr154/src/share/dtd j2ee_1_4.xsd Log: Patch by Mark Roth: - update the J2EE 1.4 schema jsr154/src/share/dtd/j2ee_1_4.xsd to clarify that fully-qualified-classType is a binary name Revision ChangesPath 1.10 +6 -2 jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd Index: j2ee_1_4.xsd === RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- j2ee_1_4.xsd 18 Aug 2003 17:41:20 - 1.9 +++ j2ee_1_4.xsd 25 Sep 2003 22:33:18 - 1.10 @@ -8,7 +8,7 @@ version=1.4 xsd:annotation xsd:documentation - @(#)j2ee_1_4.xsds 1.42 03/08/01 + @(#)j2ee_1_4.xsds 1.43 03/09/16 /xsd:documentation /xsd:annotation @@ -497,7 +497,11 @@ xsd:documentation The elements that use this type designate the name of a - Java class or interface. + Java class or interface. The name is in the form of a + binary name, as defined in the JLS. This is the form + of name used in Class.forName(). Tools that need the + canonical name (the name used in source code) will need + to convert this binary name to the canonical name. /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 j2ee_1_4.xsd web-jsptaglibrary_2_0.xsd
kinman 2003/08/18 10:41:20
Modified:jsr152/src/share/dtd web-jsptaglibrary_2_0.xsd
jsr154/src/share/dtd j2ee_1_4.xsd web-jsptaglibrary_2_0.xsd
Log:
- Patch by Mark Roth
Patch to the JSP 2.0 TLD and J2EE 1.4 schemas based on recent
specification changes.
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd
jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd
- Made body-content element mandatory since default valid
is unusable for Simple Tag Handlers.
jsr154/src/share/dtd/j2ee_1_4.xsd
- Updated to latest J2EE 1.4 schema
- Moved java-typeType to common file.
Revision ChangesPath
1.13 +6 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- web-jsptaglibrary_2_0.xsd 16 May 2003 23:20:17 - 1.12
+++ web-jsptaglibrary_2_0.xsd 18 Aug 2003 17:41:20 - 1.13
@@ -472,12 +472,15 @@
/xsd:annotation
/xsd:element
xsd:element name=body-content
-type=j2ee:body-contentType
-minOccurs=0
+type=j2ee:body-contentType
xsd:annotation
xsd:documentation
- The default (if not defined) is JSP
+ 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.
/xsd:documentation
/xsd:annotation
1.9 +20 -1 jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd
Index: j2ee_1_4.xsd
===
RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- j2ee_1_4.xsd 16 May 2003 23:20:18 - 1.8
+++ j2ee_1_4.xsd 18 Aug 2003 17:41:20 - 1.9
@@ -8,7 +8,7 @@
version=1.4
xsd:annotation
xsd:documentation
- %W% %E%
+ @(#)j2ee_1_4.xsds 1.42 03/08/01
/xsd:documentation
/xsd:annotation
@@ -637,6 +637,25 @@
xsd:simpleContent
xsd:restriction base=j2ee:string
xsd:pattern value=($|_|\p{L})(\p{L}|\p{Nd}|_|$)*/
+ /xsd:restriction
+/xsd:simpleContent
+ /xsd:complexType
+
+!-- --
+
+ xsd:complexType name=java-typeType
+xsd:annotation
+ xsd:documentation
+
+ This is a generic type that designates a Java primitive
+ type or a fully qualified name of a Java interface/type,
+ or an array of such types.
+
+ /xsd:documentation
+/xsd:annotation
+xsd:simpleContent
+ xsd:restriction base=j2ee:string
+ xsd:pattern value=[^\p{Z}]*/
/xsd:restriction
/xsd:simpleContent
/xsd:complexType
1.13 +6 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- web-jsptaglibrary_2_0.xsd 16 May 2003 23:20:18 - 1.12
+++ web-jsptaglibrary_2_0.xsd 18 Aug 2003 17:41:20 - 1.13
@@ -472,12 +472,15 @@
/xsd:annotation
/xsd:element
xsd:element name=body-content
-type=j2ee:body-contentType
-minOccurs=0
+type=j2ee:body-contentType
xsd:annotation
xsd:documentation
- The default (if not defined) is JSP
+ 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.
/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 j2ee_1_4.xsd jsp_2_0.xsd jspxml.dtd jspxml.xsd web-app_2_4.xsd web-jsptaglibrary_2_0.xsd
kinman 2002/11/08 13:30:21 Modified:jsr152/src/share/dtd jsp_2_0.xsd jspxml.dtd jspxml.xsd web-jsptaglibrary_2_0.xsd jsr152/src/share/javax/servlet/jsp JspContext.java jsr152/src/share/javax/servlet/jsp/tagext PageData.java TagSupport.java jsr154/src/share/dtd j2ee_1_4.xsd jsp_2_0.xsd jspxml.dtd jspxml.xsd web-app_2_4.xsd web-jsptaglibrary_2_0.xsd Log: - Patch by 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 Revision ChangesPath 1.5 +10 -7 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.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jsp_2_0.xsd 9 Oct 2002 17:38:49 - 1.4 +++ jsp_2_0.xsd 8 Nov 2002 21:30:20 - 1.5 -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 1.2 +2 -9 jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.dtd Index: jspxml.dtd === RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/dtd/jspxml.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jspxml.dtd13 Aug 2002 16:20:58 - 1.1 +++ jspxml.dtd8 Nov 2002 21:30:20 - 1.2 -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
cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd j2ee_1_4.xsd web-app_2_4.xsd
kinman 2002/10/07 09:53:43 Modified:jsr152/src/share/javax/servlet/jsp/el ExpressionEvaluator.java jsr154/src/share/dtd j2ee_1_4.xsd web-app_2_4.xsd Log: - Patch submitted by Mark Roth jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java: - Removed null as a valid return type for parseExpression() and evaluate(). These methods must throw an ELException in this case. jsr154/src/share/dtd/j2ee_1_4.xsd: - Added jndiEnvironmentRefsGroup jsr154/src/share/dtd/web-app_2_4.xsd: - Added jndiEnvironmentRefsGroup Revision ChangesPath 1.4 +2 -4 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ExpressionEvaluator.java 3 Oct 2002 23:01:44 - 1.3 +++ ExpressionEvaluator.java 7 Oct 2002 16:53:42 - 1.4 @@ -105,8 +105,7 @@ * it is invoked. * @param defaultPrefix The default prefix to use when a function is * encountered with no prefix. - * @return The Expression object encapsulating the arguments, or null - * if errors were encountered. + * @return The Expression object encapsulating the arguments. * * @exception ELException Thrown if parsing errors were found. */ @@ -135,8 +134,7 @@ * it is invoked. * @param defaultPrefix The default prefix to use when a function is * encountered with no prefix. - * @return The result of the expression evaluation or null if errors - * were encountered. + * @return The result of the expression evaluation. * * @exception ELException Thrown if the expression evaluation failed. */ 1.4 +37 -3 jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd Index: j2ee_1_4.xsd === RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- j2ee_1_4.xsd 3 Oct 2002 23:01:44 - 1.3 +++ j2ee_1_4.xsd 7 Oct 2002 16:53:43 - 1.4 @@ -9,7 +9,7 @@ version=1.4 xsd:annotation xsd:documentation -@(#)j2ee_1_4.xsds1.31 02/10/01 +@(#)j2ee_1_4.xsds1.32 02/10/04 /xsd:documentation /xsd:annotation @@ -136,8 +136,8 @@ xsd:annotation xsd:documentation -This group is used to keep the contained elements in a consistent -order across J2EE deployment descriptors. +This group keeps the usage of the contained description related +elements consistent across J2EE deployment descriptors. /xsd:documentation /xsd:annotation @@ -733,6 +733,40 @@ xsd:restriction base=j2ee:string/ /xsd:simpleContent /xsd:complexType + +!-- -- + +xsd:group name=jndiEnvironmentRefsGroup +xsd:annotation +xsd:documentation + +This group keeps the usage of the contained JNDI environment +reference elements consistent across J2EE deployment descriptors. + +/xsd:documentation +/xsd:annotation +xsd:sequence +xsd:element name=env-entry + type=j2ee:env-entryType + minOccurs=0 maxOccurs=unbounded/ +xsd:element name=ejb-ref + type=j2ee:ejb-refType + minOccurs=0 maxOccurs=unbounded/ +xsd:element name=ejb-local-ref + type=j2ee:ejb-local-refType + minOccurs=0 maxOccurs=unbounded/ +xsd:group ref=j2ee:service-refGroup/ +xsd:element name=resource-ref + type=j2ee:resource-refType + minOccurs=0 maxOccurs=unbounded/ +xsd:element name=resource-env-ref + type=j2ee:resource-env-refType + minOccurs=0 maxOccurs=unbounded/ +xsd:element name=message-destination-ref + type=j2ee:message-destination-refType + minOccurs=0 maxOccurs=unbounded/ +/xsd:sequence +/xsd:group !-- -- 1.6 +2 -26 jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd Index: web-app_2_4.xsd === RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v retrieving revision 1.5 retrieving revision 1.6
cvs commit: jakarta-servletapi-5/jsr154/src/share/dtd j2ee_1_4.xsd web-app_2_4.xsd xml.xsd
kinman 2002/09/25 10:01:32 Modified:jsr154/src/share/dtd j2ee_1_4.xsd web-app_2_4.xsd xml.xsd Log: - Submitted by Mark Roth: Attached is a patch to bring the other Servlet 2.4 XSD files up to date with the JSP patch I submitted on September 19. Revision ChangesPath 1.2 +387 -188 jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd Index: j2ee_1_4.xsd === RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- j2ee_1_4.xsd 13 Aug 2002 16:21:47 - 1.1 +++ j2ee_1_4.xsd 25 Sep 2002 17:01:32 - 1.2 @@ -9,7 +9,7 @@ version=1.4 xsd:annotation xsd:documentation -@(#)j2ee_1_4.xsds1.20 02/07/12 +@(#)j2ee_1_4.xsds1.28 02/09/19 /xsd:documentation /xsd:annotation @@ -74,6 +74,8 @@ xsd:import namespace=http://www.w3.org/XML/1998/namespace; schemaLocation=http://www.w3.org/2001/xml.xsd/ +xsd:include schemaLocation=j2ee_web_services_client_1_1.xsd/ + !-- -- @@ -123,11 +125,39 @@ type=xsd:anyURI/ xsd:attribute name=mustUnderstand type=xsd:boolean/ +xsd:attribute name=id type=xsd:ID/ /xsd:complexType !-- -- +xsd:group name=descriptionGroup +xsd:annotation +xsd:documentation + +This group is used to keep the contained elements in a consistent +order across J2EE deployment descriptors. + +/xsd:documentation +/xsd:annotation +xsd:sequence +xsd:element name=description + type=j2ee:descriptionType + minOccurs=0 + maxOccurs=unbounded/ +xsd:element name=display-name + type=j2ee:display-nameType + minOccurs=0 + maxOccurs=unbounded/ +xsd:element name=icon + type=j2ee:iconType + minOccurs=0 + maxOccurs=unbounded/ +/xsd:sequence +/xsd:group + +!-- -- + xsd:complexType name=descriptionType xsd:annotation xsd:documentation @@ -147,13 +177,11 @@ /xsd:documentation /xsd:annotation - xsd:simpleContent -xsd:extension base=xsd:string -xsd:attribute ref=xml:lang/ +xsd:extension base=j2ee:xsdStringType +xsd:attribute ref=xml:lang/ /xsd:extension /xsd:simpleContent - /xsd:complexType !-- -- @@ -187,24 +215,22 @@ Example: ... - display-name xml:lang=enEmployee Self Service/display-name + lt;display-name xml:lang=enEmployee Self Servicelt;/display-name The value of the xml:lang attribute is en (English) by default. /xsd:documentation /xsd:annotation - xsd:simpleContent xsd:extension base=j2ee:string -xsd:attribute ref=xml:lang/ +xsd:attribute ref=xml:lang/ /xsd:extension /xsd:simpleContent - /xsd:complexType !-- -- -xsd:simpleType name=ejb-linkType +xsd:complexType name=ejb-linkType xsd:annotation xsd:documentation @@ -226,16 +252,18 @@ Examples: +![CDATA[ ejb-linkEmployeeRecord/ejb-link ejb-link../products/product.jar#ProductEJB/ejb-link +]] /xsd:documentation /xsd:annotation - -xsd:restriction base=j2ee:string/ - -/xsd:simpleType +xsd:simpleContent +xsd:restriction base=j2ee:string/ +/xsd:simpleContent +/xsd:complexType !-- -- @@ -275,13 +303,17 @@ xsd:element name=ejb-link type=j2ee:ejb-linkType minOccurs=0/ +xsd:element name=deployment-extension + type=j2ee:deployment-extensionType + minOccurs=0 + maxOccurs=unbounded/ /xsd:sequence - +xsd:attribute name=id type=xsd:ID/ /xsd:complexType !-- -- -xsd:simpleType name=ejb-ref-nameType +xsd:complexType name=ejb-ref-nameType xsd:annotation xsd:documentation @@ -295,18 +327,18 @@ Example: -ejb-ref-nameejb/Payroll/ejb-ref-name +lt;ejb-ref-nameejb/Payrolllt;/ejb-ref-name /xsd:documentation /xsd:annotation - -xsd:restriction base=j2ee:jndi-nameType/ - -/xsd:simpleType +xsd:simpleContent +xsd:restriction
