NEW FILE (in jakarta-servletapi-5.newfiles.tar):
- jsr154/src/share/dtd/j2ee_web_services_1_1.xsd
(Required by latest j2ee_1_4.xsd)
CHANGED FILES:
jsr152/src/share/javax/servlet/jsp/JspContext.java:
- getAttribute(name): Remove IllegalArgumentException
for non-existent scope parameter.
- Added javadoc for IllegalArgumentException for
removeAttribute(name, scope)
- Added javadoc for IllegalArgumentException for
getAttributeNamesInScope(scope)
- Added 'public JspWriter pushBody( java.io.Writer writer );'
- Moved 'public JspWriter popBody()' from PageContext to JspContext.
jsr152/src/share/javax/servlet/jsp/PageContext.java:
- forward(path): Remove IllegalArgumentException and
SecurityException, which are not declared in the RequestDispatcher
counterpart methods.
- include(path): Remove IllegalArgumentException and
SecurityException, which are not declared in the RequestDispatcher
counterpart methods.
- include(path, flush): Remove IllegalArgumentException and
SecurityException, which are not declared in the RequestDispatcher
counterpart methods.
- Moved 'public JspWriter popBody()' from PageContext to JspContext.
jsr152/src/share/javax/servlet/jsp/el/ELException.java:
- Removed toString() method, and constructors pass in localized
message of root cause Throwable.
jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java:
- resolveVariable( name, context ): Add description for
context parameter.
jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java:
- Elaborate on description of what should be passed for the
expression parameter. The expression parameter includes
the tokens '${' and '}', which can appear more than once.
For example, parseExpression( "Version ${major}.${minor}", ... )
is valid.
- Elaborate on caller requirements for passing in a FunctionMapper
to evaluate() and parseExpression().
jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd:
- Escape markup in documentation with CDATA instead of <
jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd:
- Escape markup in documentation with CDATA instead of <
jsr154/src/share/dtd/j2ee_1_4.xsd:
- Escape markup in documentation with CDATA instead of <
- Make CDATA sections use a consistent style
- Make xsd:include schemaLocation point to IBM site
jsr154/src/share/dtd/web-app_2_4.xsd:
- Escape markup in documentation with CDATA instead of <
- Added ERROR to list of legal values for request dispatcher
As usual, please let me know if there are any questions or concerns.
--
Mark Roth, Java Software
JSP 2.0 Co-Specification Lead
Sun Microsystems, Inc.
Index: jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd,v retrieving revision 1.3 diff -u -r1.3 web-jsptaglibrary_2_0.xsd --- jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3 +++ jsr152/src/share/dtd/web-jsptaglibrary_2_0.xsd 3 Oct 2002 21:59:54 -0000 @@ -10,7 +10,7 @@ <xsd:annotation> <xsd:documentation> -@(#)web-jsptaglibrary_2_0.xsds 1.18 09/19/02 +@(#)web-jsptaglibrary_2_0.xsds 1.19 09/30/02 </xsd:documentation> </xsd:annotation> <xsd:annotation> @@ -50,6 +50,7 @@ <xsd:annotation> <xsd:documentation> +<![CDATA[ This is the XML Schema for the JSP Taglibrary deployment descriptor. All Taglibrary deployment descriptors must @@ -61,12 +62,12 @@ and by indicating the version of the schema by using the version element as shown below: - <taglib xmlns="http://java.sun.com/xml/ns/j2ee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="..." - version="2.0"> - ... - </taglib> + <taglib xmlns="http://java.sun.com/xml/ns/j2ee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="..." + version="2.0"> + ... + </taglib> The instance documents may indicate the published version of the schema using xsi:schemaLocation attribute @@ -74,6 +75,7 @@ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd +]]> </xsd:documentation> </xsd:annotation> Index: jsr152/src/share/javax/servlet/jsp/JspContext.java =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/JspContext.java,v retrieving revision 1.2 diff -u -r1.2 JspContext.java --- jsr152/src/share/javax/servlet/jsp/JspContext.java 19 Aug 2002 16:29:49 -0000 1.2 +++ jsr152/src/share/javax/servlet/jsp/JspContext.java 3 Oct 2002 21:59:54 -0000 @@ -78,6 +78,12 @@ * scripting environment * </ul> * + * <p><B>Methods Intended for Container Generated Code</B> + * <p> + * The following methods enable the <B>management of nested</B> JspWriter + * streams to implement Tag Extensions: <code>pushBody()</code> and + * <code>popBody()</code> + * * <p><B>Methods Intended for JSP authors</B> * <p> * The following methods provide <B>convenient access</B> to implicit objects: @@ -152,7 +158,6 @@ * or null if not found. * * @throws NullPointerException if the name is null - * @throws IllegalArgumentException if the scope is invalid */ abstract public Object getAttribute(String name); @@ -198,6 +203,7 @@ * * @param name The name of the object to remove. * @param scope The scope where to look. + * @throws IllegalArgumentException if the scope is invalid */ abstract public void removeAttribute(String name, int scope); @@ -217,6 +223,7 @@ * @param scope the scope to enumerate all the attributes for * @return an enumeration of names (java.lang.String) of all the * attributes the specified scope + * @throws IllegalArgumentException if the scope is invalid */ abstract public Enumeration getAttributeNamesInScope(int scope); @@ -247,4 +254,39 @@ * @since JSP2.0 */ public abstract VariableResolver getVariableResolver(); + + /** + * Return a new JspWriter object that sends output to the + * provided Writer. Saves the current "out" JspWriter, + * and updates the value of the "out" attribute in the + * page scope attribute namespace of the JspContext. + * <p>The returned JspWriter must implement all methods and + * behave as though it were unbuffered. More specifically: + * <ul> + * <li>clear() must throw an IOException</li> + * <li>clearBuffer() does nothing</li> + * <li>getBufferSize() always returns 0</li> + * <li>getRemaining() always returns 0</li> + * </ul> + * </p> + * + * @param writer The Writer for the returned JspWriter to send + * output to. + * @return a new JspWriter that writes to the given Writer. + * @since JSP2.0 + */ + public JspWriter pushBody( java.io.Writer writer ) { + return null; // XXX to implement + } + + /** + * Return the previous JspWriter "out" saved by the matching + * pushBody(), and update the value of the "out" attribute in + * the page scope attribute namespace of the JspContext + * + * @return the saved JspWriter. + */ + public JspWriter popBody() { + return null; // XXX to implement + } } Index: jsr152/src/share/javax/servlet/jsp/PageContext.java =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/PageContext.java,v retrieving revision 1.3 diff -u -r1.3 PageContext.java --- jsr152/src/share/javax/servlet/jsp/PageContext.java 20 Sep 2002 01:55:43 -0000 1.3 +++ jsr152/src/share/javax/servlet/jsp/PageContext.java 3 Oct 2002 21:59:54 -0000 @@ -115,8 +115,7 @@ * * <p> * The following methods enable the <B>management of nested</B> JspWriter - * streams to implement Tag Extensions: <code>pushBody()</code> and - * <code>popBody()</code> + * streams to implement Tag Extensions: <code>pushBody()</code> * * <p><B>Methods Intended for JSP authors</B> * <p> @@ -300,9 +299,10 @@ abstract public HttpSession getSession(); /** - * The current value of the page object (a Servlet). + * The current value of the page object (In a Servlet environment, + * this is an instance of javax.servlet.Servlet). * - * @return the Page implementation class instance (Servlet) associated + * @return the Page implementation class instance associated * with this PageContext */ @@ -377,10 +377,8 @@ * @param relativeUrlPath specifies the relative URL path to the target * resource as described above * - * @throws IllegalArgumentException if target resource URL is unresolvable * @throws IllegalStateException if <code> ServletResponse </code> is not * in a state where a forward can be performed - * @throws SecurityException if target resource cannot be accessed by caller * @throws ServletException if the page that was forwarded to throws * a ServletException * @throws IOException if an I/O error occurred while forwarding @@ -415,9 +413,6 @@ * @param relativeUrlPath specifies the relative URL path to the target * resource to be included * - * @throws IllegalArgumentException if the target resource URL is - * unresolvable - * @throws SecurityException if target resource cannot be accessed by caller * @throws ServletException if the page that was forwarded to throws * a ServletException * @throws IOException if an I/O error occurred while forwarding @@ -457,9 +452,6 @@ * @throws ServletException if the page that was forwarded to throws * a ServletException * @throws IOException if an I/O error occurred while forwarding - * @throws IllegalArgumentException if the target resource URL is - * unresolvable - * @throws SecurityException if target resource cannot be accessed by caller * @since JSP2.0 */ abstract public void include(String relativeUrlPath, boolean flush) @@ -541,18 +533,6 @@ return null; // XXX to implement } - - /** - * Return the previous JspWriter "out" saved by the matching - * pushBody(), and update the value of the "out" attribute in - * the page scope attribute namespace of the PageConxtext - * - * @return the saved JspWriter. - */ - - public JspWriter popBody() { - return null; // XXX to implement - } /** * Provides convenient access to error information. Index: jsr152/src/share/javax/servlet/jsp/el/ELException.java =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/ELException.java,v retrieving revision 1.2 diff -u -r1.2 ELException.java --- jsr152/src/share/javax/servlet/jsp/el/ELException.java 19 Aug 2002 16:29:49 -0000 1.2 +++ jsr152/src/share/javax/servlet/jsp/el/ELException.java 3 Oct 2002 21:59:54 +-0000 @@ -69,7 +69,7 @@ // Member variables //------------------------------------- - Throwable mRootCause; + private Throwable mRootCause; //------------------------------------- /** @@ -99,6 +99,7 @@ **/ public ELException (Throwable pRootCause) { + super( pRootCause.getLocalizedMessage() ); mRootCause = pRootCause; } @@ -126,25 +127,4 @@ { return mRootCause; } - - //------------------------------------- - /** - * String representation - * - * @return a String representation of this ELException - **/ - public String toString () - { - if (getMessage () == null) { - return mRootCause.toString (); - } - else if (mRootCause == null) { - return getMessage (); - } - else { - return getMessage () + ": " + mRootCause; - } - } - - //------------------------------------- } 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.2 diff -u -r1.2 ExpressionEvaluator.java --- jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java 19 Aug 2002 16:29:50 -0000 1.2 +++ jsr152/src/share/javax/servlet/jsp/el/ExpressionEvaluator.java 3 Oct 2002 +21:59:54 -0000 @@ -74,23 +74,39 @@ * assume that only one object of each ExpressionEvaluator type will be * instantiated; global caching should therefore be static.</p> * + * <p>For JSP EL expressions, an expression string without '${' and '}' + * tokens is considered to be a static string. One or more occurrences + * of '${' and '}' can be used in the expression string to delimit + * dynamic expressions. Examples: + * <ul> + * <li><code>${lastName}</code></li> + * <li><code>${8 * 8}</code></li> + * <li><code>Version ${major}.${minor}</code></li> + * <li><code>${my:reverse('hello')}</code></li> + * </ul> + * </p> + * * @since JSP2.0 */ public interface ExpressionEvaluator { /** * Prepare an expression for later evaluation. This method should perform - * syntactic validation of the expression; if in doing so it detects errors, it - * should raise an ELParseException. + * syntactic validation of the expression; if in doing so it detects + * errors, it should raise an ELParseException. * - * @param expression The expression to be evaluated + * @param expression The expression to be evaluated. * @param expectedType The expected type of the result of the evaluation - * @param fMapper A FuntionMapper to resolve functions found in the expression. - * It can be null, in which case no functions are supported for this invocation. + * @param fMapper A FunctionMapper to resolve functions found in + * the expression. It can be null, in which case no functions + * are supported for this invocation. The FunctionMapper will be + * invoked one or more times between parsing the expression and + * evaluating it, and must return a consistent value each time + * 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. + * encountered with no prefix. + * @return The Expression object encapsulating the arguments, or null + * if errors were encountered. * * @exception ELException Thrown if parsing errors were found. */ @@ -102,19 +118,25 @@ /** - * Evaluates an expression. This method may perform some syntactic validation - * and, if so, it should raise an ELParseException error if it encounters syntactic - * errors. EL evaluation errors should cause an ELException to be raised. + * Evaluates an expression. This method may perform some syntactic + * validation and, if so, it should raise an ELParseException error if + * it encounters syntactic errors. EL evaluation errors should cause + * an ELException to be raised. * - * @param expression The expression to be evaluated + * @param expression The expression to be evaluated. * @param expectedType The expected type of the result of the evaluation - * @param vResolver A VariableResolver instance that can be used at runtime to - * resolve the name of implicit objects into Objects. - * @param fMapper A FuntionMapper to resolve functions found in the expression. - * It can be null, in which case no functions are supported for this invocation. + * @param vResolver A VariableResolver instance that can be used at + * runtime to resolve the name of implicit objects into Objects. + * @param fMapper A FunctionMapper to resolve functions found in + * the expression. It can be null, in which case no functions + * are supported for this invocation. The FunctionMapper will be + * invoked one or more times between parsing the expression and + * evaluating it, and must return a consistent value each time + * 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. + * encountered with no prefix. + * @return The result of the expression evaluation or null if errors + * were encountered. * * @exception ELException Thrown if the expression evaluation failed. */ Index: jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java,v retrieving revision 1.2 diff -u -r1.2 VariableResolver.java --- jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java 19 Aug 2002 16:29:50 -0000 1.2 +++ jsr152/src/share/javax/servlet/jsp/el/VariableResolver.java 3 Oct 2002 21:59:54 +-0000 @@ -76,6 +76,10 @@ * Returns null if the variable is not found. * * @param pName the name of the variable to resolve + * @param pContext the context in which the variable is being resolved. + * The actual instance varies depending on the environment in which + * the Expression Evaluator is used. For example, in a JSP context, + * the context would normally be an instance of JspContext. * @return the result of the variable resolution * * @throws ELException if a failure occurred while trying to resolve Index: jsr152/src/share/javax/servlet/jsp/tagext/.nbattrs =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr152/src/share/javax/servlet/jsp/tagext/.nbattrs,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 .nbattrs --- jsr152/src/share/javax/servlet/jsp/tagext/.nbattrs 13 Aug 2002 16:20:55 -0000 1.1.1.1 +++ jsr152/src/share/javax/servlet/jsp/tagext/.nbattrs 3 Oct 2002 21:59:54 -0000 @@ -3,6 +3,5 @@ <attributes version="1.0"> <fileobject name="SimpleTag.java"> <attr name="class_dependency_javax.servlet.jsp.tagext.BodyTag" serialvalue="aced0005737200316f72672e6f70656e6964652e66696c6573797374656d732e4d756c746946696c654f626a65637424566f696456616c7565d9ec9c94d5fd3ca40c0000787077040000000078"/> - <attr name="class_dependency_javax.servlet.jsp.tagext.Tag" stringvalue="SimpleTag"/> </fileobject> </attributes> 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.2 diff -u -r1.2 j2ee_1_4.xsd --- jsr154/src/share/dtd/j2ee_1_4.xsd 25 Sep 2002 17:01:32 -0000 1.2 +++ jsr154/src/share/dtd/j2ee_1_4.xsd 3 Oct 2002 21:59:55 -0000 @@ -9,7 +9,7 @@ version="1.4"> <xsd:annotation> <xsd:documentation> -@(#)j2ee_1_4.xsds 1.28 02/09/19 +@(#)j2ee_1_4.xsds 1.31 02/10/01 </xsd:documentation> </xsd:annotation> @@ -74,7 +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"/> +<xsd:include schemaLocation= +"http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/> <!-- **************************************************** --> @@ -207,6 +208,7 @@ <xsd:complexType name="display-nameType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The display-name type contains a short name that is intended to be displayed by tools. It is used by display-name @@ -215,10 +217,11 @@ Example: ... - <display-name xml:lang="en">Employee Self Service</display-name> + <display-name xml:lang="en">Employee Self Service</display-name> The value of the xml:lang attribute is "en" (English) by default. +]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -233,6 +236,7 @@ <xsd:complexType name="ejb-linkType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The ejb-linkType is used by ejb-link elements in the ejb-ref or ejb-local-ref elements to specify @@ -252,12 +256,11 @@ Examples: -<![CDATA[ <ejb-link>EmployeeRecord</ejb-link> <ejb-link>../products/product.jar#ProductEJB</ejb-link> -]]> +]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -316,6 +319,7 @@ <xsd:complexType name="ejb-ref-nameType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The ejb-ref-name element contains the name of an EJB reference. The EJB reference is an entry in the @@ -327,8 +331,9 @@ Example: -<ejb-ref-name>ejb/Payroll</ejb-ref-name> +<ejb-ref-name>ejb/Payroll</ejb-ref-name> +]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -428,6 +433,7 @@ <xsd:complexType name="env-entry-type-valuesType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ This type contains the fully-qualified Java type of the environment entry value that is expected by the @@ -447,8 +453,9 @@ Example: -<env-entry-type>java.lang.Boolean</env-entry-type> +<env-entry-type>java.lang.Boolean</env-entry-type> +]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -492,6 +499,7 @@ type="j2ee:jndi-nameType"> <xsd:annotation> <xsd:documentation> + <![CDATA[ The env-entry-name element contains the name of a Deployment Component's environment entry. The name @@ -503,8 +511,9 @@ Example: - <env-entry-name>minAmount</env-entry-name> + <env-entry-name>minAmount</env-entry-name> + ]]> </xsd:documentation> </xsd:annotation> </xsd:element> @@ -517,6 +526,7 @@ minOccurs="0"> <xsd:annotation> <xsd:documentation> + <![CDATA[ The env-entry-value designates the value of a Deployment Component's environment entry. The value @@ -527,8 +537,9 @@ Example: - <env-entry-value>100.00</env-entry-value> + <env-entry-value>100.00</env-entry-value> + ]]> </xsd:documentation> </xsd:annotation> </xsd:element> @@ -597,14 +608,16 @@ <xsd:complexType name="homeType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The homeType defines the fully-qualified name of an enterprise bean's home interface. Example: - <home>com.aardvark.payroll.PayrollHome</home> + <home>com.aardvark.payroll.PayrollHome</home> +]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -635,6 +648,8 @@ minOccurs="0"> <xsd:annotation> <xsd:documentation> + <![CDATA[ + The small-icon element contains the name of a file containing a small (16 x 16) icon image. The file name is a relative path within the Deployment @@ -645,7 +660,9 @@ Example: - <small-icon>employee-service-icon16x16.jpg</small-icon> + <small-icon>employee-service-icon16x16.jpg</small-icon> + + ]]> </xsd:documentation> </xsd:annotation> </xsd:element> @@ -653,6 +670,7 @@ minOccurs="0"> <xsd:annotation> <xsd:documentation> + <![CDATA[ The large-icon element contains the name of a file containing a large @@ -665,7 +683,9 @@ Example: - <large-icon>employee-service-icon32x32.jpg</large-icon> + <large-icon>employee-service-icon32x32.jpg</large-icon> + + ]]> </xsd:documentation> </xsd:annotation> </xsd:element> @@ -784,6 +804,7 @@ <xsd:complexType name="message-destination-refType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The message-destination-ref element contains a declaration of Deployment Component's reference to a message destination @@ -800,7 +821,6 @@ Examples: -<![CDATA[ <message-destination-ref> <message-destination-ref-name>jms/StockQueue </message-destination-ref-name> @@ -811,8 +831,8 @@ <message-destination-link>CorporateStocks </message-destination-link> </message-destination-ref> -]]> +]]> </xsd:documentation> </xsd:annotation> <xsd:sequence> @@ -858,6 +878,7 @@ <xsd:complexType name="message-destination-typeType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The message-destination-typeType specifies the type of the destination. The type is specified by the Java interface @@ -865,9 +886,10 @@ Example: - <message-destination-type>javax.jms.Queue - </message-destination-type> + <message-destination-type>javax.jms.Queue + </message-destination-type> +]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -910,6 +932,7 @@ <xsd:complexType name="message-destinationType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The message-destinationType specifies a message destination. The logical destination described by this @@ -926,13 +949,12 @@ Example: -<![CDATA[ <message-destination> <message-destination-name>CorporateStocks </message-destination-name> </message-destination> -]]> +]]> </xsd:documentation> </xsd:annotation> <xsd:sequence> @@ -1034,14 +1056,16 @@ <xsd:complexType name="remoteType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The remote element contains the fully-qualified name of the enterprise bean's remote interface. Example: - <remote>com.wombat.empl.EmployeeService</remote> + <remote>com.wombat.empl.EmployeeService</remote> +]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> @@ -1108,6 +1132,7 @@ <xsd:complexType name="resource-env-refType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The resource-env-refType is used to define resource-env-type elements. It contains a declaration of a @@ -1120,15 +1145,14 @@ Example: -<![CDATA[ <resource-env-ref> <resource-env-ref-name>jms/StockQueue </resource-env-ref-name> <resource-env-ref-type>javax.jms.Queue </resource-env-ref-type> </resource-env-ref> -]]> +]]> </xsd:documentation> </xsd:annotation> @@ -1181,6 +1205,7 @@ <xsd:complexType name="resource-refType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The resource-refType contains a declaration of a Deployment Component's reference to an external resource. It @@ -1194,15 +1219,14 @@ Example: -<![CDATA[ <resource-ref> <res-ref-name>jdbc/EmployeeAppDB</res-ref-name> <res-type>javax.sql.DataSource</res-type> <res-auth>Container</res-auth> <res-sharing-scope>Shareable</res-sharing-scope> </resource-ref> -]]> +]]> </xsd:documentation> </xsd:annotation> @@ -1356,6 +1380,7 @@ <xsd:complexType name="security-roleType"> <xsd:annotation> <xsd:documentation> +<![CDATA[ The security-roleType contains the definition of a security role. The definition consists of an optional description of the @@ -1363,7 +1388,6 @@ Example: -<![CDATA[ <security-role> <description> This role includes all employees who are authorized @@ -1371,8 +1395,8 @@ </description> <role-name>employee</role-name> </security-role> -]]> +]]> </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.4 diff -u -r1.4 web-app_2_4.xsd --- jsr154/src/share/dtd/web-app_2_4.xsd 25 Sep 2002 17:01:32 -0000 1.4 +++ jsr154/src/share/dtd/web-app_2_4.xsd 3 Oct 2002 21:59:55 -0000 @@ -8,7 +8,7 @@ version="2.4"> <xsd:annotation> <xsd:documentation> -@(#)web-app_2_4.xsds 1.40 02/09/19 +@(#)web-app_2_4.xsds 1.44 02/09/30 </xsd:documentation> </xsd:annotation> @@ -49,10 +49,12 @@ <xsd:annotation> <xsd:documentation> +<![CDATA[ -This is the XML Schema for the Servlet 2.4 deployment -descriptor. All Servlet deployment descriptors must -indicate the web application schema by using the J2EE +This is the XML Schema for the Servlet 2.4 deployment descriptor. +The deployment descriptor must be named "WEB-INF/web.xml" in the +web application's war file. All Servlet deployment descriptors +must indicate the web application schema by using the J2EE namespace: http://java.sun.com/xml/ns/j2ee @@ -60,12 +62,12 @@ and by indicating the version of the schema by using the version element as shown below: - <web-app xmlns="http://java.sun.com/xml/ns/j2ee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="..." - version="2.4"> - ... - </web-app> + <web-app xmlns="http://java.sun.com/xml/ns/j2ee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="..." + version="2.4"> + ... + </web-app> The instance documents may indicate the published version of the schema using the xsi:schemaLocation attribute for J2EE @@ -73,6 +75,7 @@ http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd +]]> </xsd:documentation> </xsd:annotation> @@ -332,16 +335,16 @@ <xsd:annotation> <xsd:documentation> -The dispatcher has three legal values, FORWARD and REQUEST -and INCLUDE. A value of FORWARD means the Filter -will be applied under RequestDispatcher.forward() calls. -A value of REQUEST means the Filter will be applied -under ordinary client calls to the path or servlet. A value of -INCLUDE means the Filter will be applied under -RequestDispatcher.include() calls. -The absence of any dispatcher elements in a -filter-mapping indicates a default of applying -filters only under ordinary client calls to the path or servlet. +The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE, +and ERROR. A value of FORWARD means the Filter will be applied +under RequestDispatcher.forward() calls. A value of REQUEST +means the Filter will be applied under ordinary client calls to +the path or servlet. A value of INCLUDE means the Filter will be +applied under RequestDispatcher.include() calls. A value of +ERROR means the Filter will be applied under the error page +mechanism. The absence of any dispatcher elements in a +filter-mapping indicates a default of applying filters only under +ordinary client calls to the path or servlet. </xsd:documentation> </xsd:annotation> @@ -351,6 +354,7 @@ <xsd:enumeration value="FORWARD"/> <xsd:enumeration value="INCLUDE"/> <xsd:enumeration value="REQUEST"/> + <xsd:enumeration value="ERROR"/> </xsd:restriction> </xsd:simpleContent> </xsd:complexType> Index: jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd =================================================================== RCS file: /home/cvspublic/jakarta-servletapi-5/jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd,v retrieving revision 1.3 diff -u -r1.3 web-jsptaglibrary_2_0.xsd --- jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd 20 Sep 2002 01:56:44 -0000 1.3 +++ jsr154/src/share/dtd/web-jsptaglibrary_2_0.xsd 3 Oct 2002 21:59:55 -0000 @@ -10,7 +10,7 @@ <xsd:annotation> <xsd:documentation> -@(#)web-jsptaglibrary_2_0.xsds 1.18 09/19/02 +@(#)web-jsptaglibrary_2_0.xsds 1.19 09/30/02 </xsd:documentation> </xsd:annotation> <xsd:annotation> @@ -50,6 +50,7 @@ <xsd:annotation> <xsd:documentation> +<![CDATA[ This is the XML Schema for the JSP Taglibrary deployment descriptor. All Taglibrary deployment descriptors must @@ -61,12 +62,12 @@ and by indicating the version of the schema by using the version element as shown below: - <taglib xmlns="http://java.sun.com/xml/ns/j2ee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="..." - version="2.0"> - ... - </taglib> + <taglib xmlns="http://java.sun.com/xml/ns/j2ee"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="..." + version="2.0"> + ... + </taglib> The instance documents may indicate the published version of the schema using xsi:schemaLocation attribute @@ -74,6 +75,7 @@ http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd +]]> </xsd:documentation> </xsd:annotation>
jakarta-servletapi-5.newfiles.tar
Description: Binary data
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
