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 Changes Path
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 -0000 1.3
+++ ExpressionEvaluator.java 7 Oct 2002 16:53:42 -0000 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 -0000 1.3
+++ j2ee_1_4.xsd 7 Oct 2002 16:53:43 -0000 1.4
@@ -9,7 +9,7 @@
version="1.4">
<xsd:annotation>
<xsd:documentation>
-@(#)j2ee_1_4.xsds 1.31 02/10/01
+@(#)j2ee_1_4.xsds 1.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
diff -u -r1.5 -r1.6
--- web-app_2_4.xsd 3 Oct 2002 23:01:44 -0000 1.5
+++ web-app_2_4.xsd 7 Oct 2002 16:53:43 -0000 1.6
@@ -8,7 +8,7 @@
version="2.4">
<xsd:annotation>
<xsd:documentation>
-@(#)web-app_2_4.xsds 1.44 02/09/30
+@(#)web-app_2_4.xsds 1.45 02/10/04
</xsd:documentation>
</xsd:annotation>
@@ -1122,31 +1122,7 @@
type="j2ee:security-roleType"
minOccurs="0"
maxOccurs="unbounded"/>
- <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:group ref="j2ee:jndiEnvironmentRefsGroup"/>
<xsd:element name="message-destination"
type="j2ee:message-destinationType"
minOccurs="0"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
