NOTE: This patch requires some changes to Jasper2 before committing. Please let me know if there are any questions or concerns.
jsr152/src/share/javax/serlvet/jsp/el/Expression.java - Removed null as a return value for error - method must throw an exception to signal an error. jsr152/src/share/dtd/jsp_2_0.xsd: jsr154/src/share/dtd/jsp_2_0.xsd: - As per the Expert Group's decision, changed <scripting-enabled> to <scripting-invalid> and <el-enabled> to <el-ignored>. Jasper2 needs to be updated accordingly. -- 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.3 diff -u -r1.3 jsp_2_0.xsd --- jsr152/src/share/dtd/jsp_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3 +++ jsr152/src/share/dtd/jsp_2_0.xsd 9 Oct 2002 00:07:29 -0000 @@ -8,7 +8,7 @@ version="2.0"> <xsd:annotation> <xsd:documentation> -@(#)jsp_2_0.xsds 1.12 09/18/02 +%W% %G% </xsd:documentation> </xsd:annotation> @@ -150,16 +150,17 @@ <xsd:element name="url-pattern" type="j2ee:url-patternType" maxOccurs="unbounded"/> - <xsd:element name="el-enabled" + <xsd:element name="el-ignored" type="j2ee:true-falseType" minOccurs="0"> <xsd:annotation> <xsd:documentation> - Can be used to easily set the isELEnabled + Can be used to easily set the isELIgnored property of a group of JSP pages. By default, the EL evaluation is enabled for Web Applications using - a Servlet 2.4 or greater web.xml. + a Servlet 2.4 or greater web.xml, and disabled + otherwise. </xsd:documentation> </xsd:annotation> @@ -181,15 +182,15 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="scripting-enabled" + <xsd:element name="scripting-invalid" type="j2ee:true-falseType" minOccurs="0"> <xsd:annotation> <xsd:documentation> - Can be used to easily set the isScriptingEnabled - property of a group of JSP pages. By default, - scripting is enabled. + Can be used to easily disable scripting in a + group of JSP pages. By default, scripting is + enabled. </xsd:documentation> </xsd:annotation> Index: jsr152/src/share/javax/servlet/jsp/el/Expression.java =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/Expression.java,v retrieving revision 1.1 diff -u -r1.1 Expression.java --- jsr152/src/share/javax/servlet/jsp/el/Expression.java 19 Aug 2002 16:29:50 -0000 1.1 +++ jsr152/src/share/javax/servlet/jsp/el/Expression.java 9 Oct 2002 00:07:29 +-0000 @@ -81,7 +81,7 @@ * * @param vResolver A VariableResolver instance that can be used at runtime to * resolve the name of implicit objects into Objects. - * @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. */ Index: jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java,v retrieving revision 1.3 diff -u -r1.3 ExpressionEvaluator.java --- jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java 3 Oct 2002 23:01:44 -0000 1.3 +++ jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java 9 Oct 2002 +00:07:33 -0000 @@ -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. */ Index: jsr154/src/share/dtd/j2ee_1_4.xsd =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/j2ee_1_4.xsd,v retrieving revision 1.3 diff -u -r1.3 j2ee_1_4.xsd --- jsr154/src/share/dtd/j2ee_1_4.xsd 3 Oct 2002 23:01:44 -0000 1.3 +++ jsr154/src/share/dtd/j2ee_1_4.xsd 9 Oct 2002 00:07:45 -0000 @@ -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> <!-- **************************************************** --> Index: jsr154/src/share/dtd/jsp_2_0.xsd =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd,v retrieving revision 1.3 diff -u -r1.3 jsp_2_0.xsd --- jsr154/src/share/dtd/jsp_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3 +++ jsr154/src/share/dtd/jsp_2_0.xsd 9 Oct 2002 00:07:48 -0000 @@ -8,7 +8,7 @@ version="2.0"> <xsd:annotation> <xsd:documentation> -@(#)jsp_2_0.xsds 1.12 09/18/02 +%W% %G% </xsd:documentation> </xsd:annotation> @@ -150,16 +150,17 @@ <xsd:element name="url-pattern" type="j2ee:url-patternType" maxOccurs="unbounded"/> - <xsd:element name="el-enabled" + <xsd:element name="el-ignored" type="j2ee:true-falseType" minOccurs="0"> <xsd:annotation> <xsd:documentation> - Can be used to easily set the isELEnabled + Can be used to easily set the isELIgnored property of a group of JSP pages. By default, the EL evaluation is enabled for Web Applications using - a Servlet 2.4 or greater web.xml. + a Servlet 2.4 or greater web.xml, and disabled + otherwise. </xsd:documentation> </xsd:annotation> @@ -181,15 +182,15 @@ </xsd:documentation> </xsd:annotation> </xsd:element> - <xsd:element name="scripting-enabled" + <xsd:element name="scripting-invalid" type="j2ee:true-falseType" minOccurs="0"> <xsd:annotation> <xsd:documentation> - Can be used to easily set the isScriptingEnabled - property of a group of JSP pages. By default, - scripting is enabled. + Can be used to easily disable scripting in a + group of JSP pages. By default, scripting is + enabled. </xsd:documentation> </xsd:annotation> Index: jsr154/src/share/dtd/web-app_2_4.xsd =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-app_2_4.xsd,v retrieving revision 1.5 diff -u -r1.5 web-app_2_4.xsd --- jsr154/src/share/dtd/web-app_2_4.xsd 3 Oct 2002 23:01:44 -0000 1.5 +++ jsr154/src/share/dtd/web-app_2_4.xsd 9 Oct 2002 00:07:53 -0000 @@ -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]>