kinman 2002/10/09 10:38:49 Modified: jsr152/src/share/dtd jsp_2_0.xsd jsr152/src/share/javax/servlet/jsp/el Expression.java jsr154/src/share/dtd jsp_2_0.xsd Log: - Patch by Mark Roth 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. Revision Changes Path 1.4 +9 -8 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jsp_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3 +++ jsp_2_0.xsd 9 Oct 2002 17:38:49 -0000 1.4 @@ -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> 1.2 +1 -1 jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/Expression.java Index: Expression.java =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/Expression.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Expression.java 19 Aug 2002 16:29:50 -0000 1.1 +++ Expression.java 9 Oct 2002 17:38:49 -0000 1.2 @@ -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. */ 1.4 +9 -8 jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd Index: jsp_2_0.xsd =================================================================== RCS file: /home/cvs/jakarta-servletapi-5/jsr154/src/share/dtd/jsp_2_0.xsd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jsp_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3 +++ jsp_2_0.xsd 9 Oct 2002 17:38:49 -0000 1.4 @@ -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>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>