[408159] Incorporate b89 draft of Java EE 7 schemas
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/beans_1_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/beans_1_1.xsd
index 79316a0..d632c17 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/beans_1_1.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/beans_1_1.xsd
@@ -140,7 +140,7 @@
<xs:element name="scan">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[The <scan> element allows exclusion of classes and packages from consideration. Various filters may be applied, and may be conditionally activated.]]>
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -148,7 +148,7 @@
<xs:element name="exclude">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[The exclude filter allows exclusion of classes and packages through the use of Ant-style glob matches. For example, <exclude name="com.acme.**"> would exclude all classes and subpackages of com.acme.]]>
</xs:documentation>
</xs:annotation>
<xs:complexType>
@@ -156,14 +156,30 @@
<xs:element name="if-class-available">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[Activates the filter only if the class specified can be loaded.]]>
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:attribute name="name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[If the named class can be loaded then, then the filter will be activated.]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="if-class-not-available">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[Activates the filter only if the class specified cannot be loaded.]]>
+ </xs:documentation>
+ </xs:annotation>
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[If the named class cannot be loaded then, then the filter will be activated.]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -172,21 +188,21 @@
<xs:element name="if-system-property">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[If both name and value are specified, then the named system property must be set, and have the specified value for the filter to be activated. If only the name is specified, then the named system property must be set for the filter to be activated.]]>
</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:attribute name="name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[The name of the system property that must be set for the filter to be active.]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="value" type="xs:string" use="optional">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[Optional. The value that the system property must have for the filter to be active.]]>
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -196,7 +212,7 @@
<xs:attribute name="name" use="required">
<xs:annotation>
<xs:documentation>
-
+ <![CDATA[The name of the class or package to exclude. Ant-style glob matches are supported. For example, <exclude name="com.acme.**"> would exclude all classes and subpackages of com.acme.]]>
</xs:documentation>
</xs:annotation>
<xs:simpleType>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_2.xsd
index 6863368..62e9ffd 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_2.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_2.xsd
@@ -461,6 +461,8 @@
cmp-version 1.x must denote a public field of the
enterprise bean class or one of its superclasses.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -485,6 +487,8 @@
1.x
2.x
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -511,6 +515,8 @@
used only for collection-valued cmr-fields. It specifies the
type of the collection that is used.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -531,6 +537,8 @@
specified by cmr-field-name in which the first
letter is uppercased, prefixed by "get" or "set".
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -923,6 +931,8 @@
relationship, if specified, is unique within the ejb-jar
file.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -995,6 +1005,8 @@
</ejb-relationship-role>
</ejb-relation>
+ Support for entity beans is optional as of EJB 3.2.
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -1034,6 +1046,8 @@
which the other ejb-relationship-role
element specifies a multiplicity of One.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1364,6 +1378,8 @@
<xsd:annotation>
<xsd:documentation>
+ Support for entity beans is optional as of EJB 3.2.
+
The entity-beanType declares an entity bean. The declaration
consists of:
@@ -1492,6 +1508,8 @@
deferred to deployment time, the prim-key-class
element should specify java.lang.Object.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1526,6 +1544,8 @@
bean whose local interface is
com.acme.commerce.Order might be Order.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1554,6 +1574,8 @@
their names must correspond to the field names of
the entity bean class that comprise the key.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -1716,6 +1738,10 @@
type="javaee:around-timeoutType"
minOccurs="0"
maxOccurs="unbounded"/>
+ <xsd:element name="around-construct"
+ type="javaee:lifecycle-callbackType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
<xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
<xsd:element name="post-activate"
type="javaee:lifecycle-callbackType"
@@ -1768,6 +1794,12 @@
method-level, both class-level and/or default-level as well as
method-level will apply.
+ The method-name element may be used to bind a constructor-level
+ interceptor using the unqualified name of the bean class as the value;
+ the optional method-params elements identify the constructor if a bean
+ class has a constructor annotated with the Inject annotation in addition
+ to a no-arg constructor.
+
There are four possible styles of the interceptor element syntax :
1.
@@ -2126,10 +2158,13 @@
timeout callback methods
message-driven bean message listener method
- This style may be used for stateful session bean lifecycle
- callback methods to specify their transaction attributes,
- if used with the method-intf element that contains
- LifecycleCallback as the value.
+ This style may also be used in combination with the
+ method-intf element that contains LifecycleCallback as
+ the value to specify transaction attributes of a stateful
+ session bean PostConstruct, PreDestroy, PrePassivate,
+ and PostActivate lifecycle callback methods or to override
+ transaction attributes of a singleton session bean
+ PostConstruct and PreDestroy lifecycle callback methods.
2.
<method>
@@ -2144,6 +2179,7 @@
name.
This style may be used to refer to stateful session bean
+ PostConstruct, PreDestroy, PrePassivate, and PostActivate
lifecycle callback methods to specify their transaction
attributes if any of the following is true:
there is only one method with this name in the specified
@@ -2360,8 +2396,10 @@
MessageEndpoint refers to the methods of a message-driven bean's
message-listener interface.
- LifecycleCallback refers to the lifecycle callback methods of
- a singleton or stateful session bean.
+ LifecycleCallback refers to the PostConstruct and PreDestroy
+ lifecycle callback methods of a singleton session bean and
+ to the PostConstruct, PreDestroy, PrePassivate, and PostActivate
+ lifecycle callback methods of a stateful session bean.
The method-intf element must be one of the following:
@@ -2455,12 +2493,18 @@
indicator to state that the method is unchecked for
authorization, and a list of method elements.
- The security roles used in the method-permissionType
- must be defined in the security-role elements of the
- deployment descriptor, and the methods must be methods
- defined in the enterprise bean's no-interface view,
- business, home, component and/or web service endpoint
- interfaces.
+ Except as noted below the security roles used in the
+ method-permissionType must be defined in the security-role
+ elements of the deployment descriptor, and the methods
+ must be methods defined in the enterprise bean's no-interface
+ view, business, home, component and/or web service endpoint
+ interfaces.
+
+ If the role name "**" is included in the list of allowed
+ roles, and the application has not defined in its deployment
+ descriptor an application security role with this name,
+ then the list of allowed roles includes every and any
+ authenticated user.
</xsd:documentation>
</xsd:annotation>
@@ -2509,6 +2553,8 @@
One
Many
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2534,6 +2580,8 @@
Bean
Container
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2622,6 +2670,8 @@
</ejb-ql>
</query>
+ Support for entity beans is optional as of EJB 3.2.
+
]]>
</xsd:documentation>
</xsd:annotation>
@@ -2648,6 +2698,8 @@
relationship-role-source elements to uniquely identify an
entity bean.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -2675,6 +2727,8 @@
description; and a list of ejb-relation elements, which
specify the container managed relationships.
+ Support for entity beans is optional as of EJB 3.2.
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_7.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_7.xsd
index 72ea7a1..f9fdb31 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_7.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_7.xsd
@@ -368,13 +368,13 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
- <xsd:element name="class-name"
+ <xsd:element name="interface-name"
type="javaee:fully-qualified-classType">
<xsd:annotation>
<xsd:documentation>
- The fully qualified domain name of the connection factory
- interface class.
+ The fully qualified class name of the connection factory
+ interface.
</xsd:documentation>
</xsd:annotation>
@@ -1376,13 +1376,30 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
+ <xsd:element name="interface-name"
+ type="javaee:fully-qualified-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Fully-qualified name of the JMS connection factory
+ interface. Permitted values are javax.jms.ConnectionFactory,
+ javax.jms.QueueConnectionFactory, or
+ javax.jms.TopicConnectionFactory. If not specified,
+ javax.jms.ConnectionFactory will be used.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:element name="class-name"
type="javaee:fully-qualified-classType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- javax.jms.ConnectionFactory, javax.jms.QueueConnectionFactory, or javax.jms.TopicConnectionFactory
+ Fully-qualified name of the JMS connection factory
+ implementation class. Ignored if a resource adapter
+ is used.
</xsd:documentation>
</xsd:annotation>
@@ -1393,7 +1410,9 @@
<xsd:annotation>
<xsd:documentation>
- Resource adapter name.
+ Resource adapter name. If not specified, the application
+ server will define the default behavior, which may or may
+ not involve the use of a resource adapter.
</xsd:documentation>
</xsd:annotation>
@@ -1519,13 +1538,27 @@
</xsd:documentation>
</xsd:annotation>
</xsd:element>
+ <xsd:element name="interface-name"
+ type="javaee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Fully-qualified name of the JMS destination interface.
+ Permitted values are javax.jms.Queue and javax.jms.Topic
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:element name="class-name"
type="javaee:fully-qualified-classType"
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- javax.jms.Queue or javax.jms.Topic
+ Fully-qualified name of the JMS destination implementation
+ class. Ignored if a resource adapter is used unless the
+ resource adapter defines more than one destination implementation
+ class for the specified interface.
</xsd:documentation>
</xsd:annotation>
@@ -1536,7 +1569,9 @@
<xsd:annotation>
<xsd:documentation>
- Resource adapter name.
+ Resource adapter name. If not specified, the application
+ server will define the default behavior, which may or may
+ not involve the use of a resource adapter.
</xsd:documentation>
</xsd:annotation>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_3_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_3_1.xsd
index 2964573..898f1b3 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_3_1.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_3_1.xsd
@@ -269,4 +269,58 @@
</xsd:keyref>
</xsd:element>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="web-appType">
+ <xsd:choice minOccurs="0"
+ maxOccurs="unbounded">
+ <xsd:element name="module-name"
+ type="javaee:string"
+ minOccurs="0"/>
+ <xsd:group ref="javaee:web-commonType"/>
+ <xsd:element name="deny-uncovered-http-methods"
+ type="javaee:emptyType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ When specified, this element causes uncovered http methods
+ to be denied. For every url-pattern that is the target of a
+ security-constrant, this element causes all HTTP methods that
+ are NOT covered (by a security constraint) at the url-pattern
+ to be denied.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="absolute-ordering"
+ type="javaee:absoluteOrderingType"/>
+ </xsd:choice>
+ <xsd:attributeGroup ref="javaee:web-common-attributes"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="absoluteOrderingType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Please see section 8.2.2 of the specification for details.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:choice minOccurs="0"
+ maxOccurs="unbounded">
+ <xsd:element name="name"
+ type="javaee:java-identifierType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="others"
+ type="javaee:ordering-othersType"
+ minOccurs="0"
+ maxOccurs="1"/>
+ </xsd:choice>
+ </xsd:complexType>
+
</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-common_3_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-common_3_1.xsd
index 0f54557..01b3948 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-common_3_1.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-common_3_1.xsd
@@ -191,37 +191,6 @@
<!-- **************************************************** -->
- <xsd:complexType name="web-appType">
- <xsd:choice minOccurs="0"
- maxOccurs="unbounded">
- <xsd:element name="module-name"
- type="javaee:string"
- minOccurs="0"/>
- <xsd:group ref="javaee:web-commonType"/>
- <xsd:element name="absolute-ordering"
- type="javaee:absoluteOrderingType"/>
- </xsd:choice>
- <xsd:attributeGroup ref="javaee:web-common-attributes"/>
- </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="web-fragmentType">
- <xsd:choice minOccurs="0"
- maxOccurs="unbounded">
- <xsd:element name="name"
- type="javaee:java-identifierType"/>
- <xsd:group ref="javaee:web-commonType"/>
- <xsd:element name="ordering"
- type="javaee:orderingType"/>
- </xsd:choice>
- <xsd:attributeGroup ref="javaee:web-common-attributes"/>
- </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
<xsd:complexType name="auth-constraintType">
<xsd:annotation>
<xsd:documentation>
@@ -1017,9 +986,12 @@
<xsd:documentation>
Specifies whether any session tracking cookies created
- by this web application will be marked as secure
- even if the request that initiated the corresponding session
- is using plain HTTP instead of HTTPS
+ by this web application will be marked as secure.
+ When true, all session tracking cookies must be marked
+ as secure independent of the nature of the request that
+ initiated the corresponding session.
+ When false, the session cookie should only be marked secure
+ if the request that initiated the session was secure.
</xsd:documentation>
</xsd:annotation>
@@ -1437,83 +1409,6 @@
<!-- **************************************************** -->
- <xsd:complexType name="absoluteOrderingType">
- <xsd:annotation>
- <xsd:documentation>
-
- Please see section 8.2.2 of the specification for details.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:choice minOccurs="0"
- maxOccurs="unbounded">
- <xsd:element name="name"
- type="javaee:java-identifierType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="others"
- type="javaee:ordering-othersType"
- minOccurs="0"
- maxOccurs="1"/>
- </xsd:choice>
- </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="orderingType">
- <xsd:annotation>
- <xsd:documentation>
-
- Please see section 8.2.2 of the specification for details.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="after"
- type="javaee:ordering-orderingType"
- minOccurs="0"
- maxOccurs="1"/>
- <xsd:element name="before"
- type="javaee:ordering-orderingType"
- minOccurs="0"
- maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="ordering-orderingType">
- <xsd:annotation>
- <xsd:documentation>
-
- This element contains a sequence of "name" elements, each of
- which
- refers to an application configuration resource by the "name"
- declared on its web.xml fragment. This element can also contain
- a single "others" element which specifies that this document
- comes
- before or after other documents within the application.
- See section 8.2.2 of the specification for details.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="name"
- type="javaee:java-identifierType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="others"
- type="javaee:ordering-othersType"
- minOccurs="0"
- maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
<xsd:complexType name="multipart-configType">
<xsd:annotation>
<xsd:documentation>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facelettaglibrary_2_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facelettaglibrary_2_2.xsd
index df140ee..779e014 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facelettaglibrary_2_2.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facelettaglibrary_2_2.xsd
@@ -55,28 +55,27 @@
<xsd:annotation>
<xsd:documentation>
<![CDATA[[
- [
- The XML Schema for the Tag Libraries in the JavaServer Faces
+ <p>The XML Schema for the Tag Libraries in the JavaServer Faces
Standard Facelets View Declaration Language (Facelets VDL)
- (Version 2.2).
+ (Version 2.2).</p>
- JSF 2.2 Facelet Tag Libraries that wish to conform to this
- schema must declare it in the following manner.
+ <p>JSF 2.2 Facelet Tag Libraries that wish to conform to this
+ schema must declare it in the following manner.</p>
- <facelet-taglib xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ <facelet-taglib xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibary_2_2.xsd"
- version="2.2">
+ version="2.2">
...
- </facelet-taglib>
+ </facelet-taglib></pre>
- The instance documents may indicate the published
+ <p>The instance documents may indicate the published
version of the schema using xsi:schemaLocation attribute
- for javaee namespace with the following location:
+ for javaee namespace with the following location:</p>
- http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibary_2_2.xsd
+ <p>http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibary_2_2.xsd</p>
]]>
</xsd:documentation>
@@ -89,44 +88,44 @@
type="javaee:facelet-taglibType">
<xsd:unique name="facelet-taglib-tagname-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
tag-names must be unique within a document.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:tag"/>
<xsd:field xpath="javaee:tag-name"/>
</xsd:unique>
<xsd:unique name="faces-config-behavior-ID-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Behavior IDs must be unique within a document.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:behavior"/>
<xsd:field xpath="javaee:behavior-id"/>
</xsd:unique>
<xsd:unique name="faces-config-converter-ID-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Converter IDs must be unique within a document.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:converter"/>
<xsd:field xpath="javaee:converter-id"/>
</xsd:unique>
<xsd:unique name="faces-config-validator-ID-uniqueness">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Validator IDs must be unique within a document.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:validator"/>
<xsd:field xpath="javaee:validator-id"/>
@@ -138,11 +137,11 @@
<xsd:complexType name="facelet-taglibType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
The top level XML element in a facelet tag library XML file.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -152,6 +151,16 @@
<xsd:sequence>
<xsd:element name="namespace"
type="javaee:string"/>
+ <xsd:element minOccurs="0" maxOccurs="1" name="short-name"
+ type="javaee:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[<p>
+
+ An advisory short name for usages of tags from this tag library.
+
+ </p>]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:element minOccurs="0"
maxOccurs="1"
name="composite-library-name"
@@ -182,12 +191,12 @@
<xsd:complexType name="facelet-taglib-extensionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Extension element for facelet-taglib. It may contain
implementation specific content.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any namespace="##any"
@@ -204,14 +213,14 @@
<xsd:complexType name="facelet-taglib-tagType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[
- If the tag library XML file contains individual tag
- declarations rather than pointing to a library-class or a
- declaring a composite-library name, the individual tags are
- enclosed in tag elements.
-
- </xsd:documentation>
+ <p>If the tag library XML
+ file contains individual tag declarations rather than pointing
+ to a library-class or a declaring a composite-library name, the
+ individual tags are enclosed in tag elements.</p>
+
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -247,22 +256,30 @@
<xsd:complexType name="facelet-taglib-tag-attributeType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
- The attribute element defines an attribute for the nesting
+ <p>The attribute element defines an attribute for the nesting
tag. The attribute element may have several subelements
- defining:
+ defining:</p>
- description a description of the attribute
+ <dl>
+
+ <dt>description</dt><dd><p> a description of the attribute
+ </p></dd>
+
+ <dt>name</dt><dd><p> the name of the attribute
+ </p></dd>
- name the name of the attribute
-
- required whether the attribute is required or
+ <dt>required</dt><dd><p> whether the attribute is required or
optional
+ </p></dd>
+
+ <dt>type</dt><dd><p> the type of the attribute
+ </p></dd>
+
+ </dl>
- type the type of the attribute
-
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -272,15 +289,15 @@
type="javaee:generic-booleanType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[
- Defines if the nesting attribute is required or
- optional.
+ <p>Defines if the nesting attribute is required or
+ optional.</p>
- If not present then the default is "false", i.e
- the attribute is optional.
+ <p>If not present then the default is "false", i.e
+ the attribute is optional.</p>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice>
@@ -288,26 +305,61 @@
type="javaee:fully-qualified-classType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Defines the Java type of the attributes
value. If this element is omitted, the
expected type is assumed to be
- "java.lang.Object".
+ "java.lang.Object".</p>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="method-signature"
type="javaee:string"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Defines the method signature for a MethodExpression-
- enabled attribute.
-
- </xsd:documentation>
+ enabled attribute. The syntax of the method-signature
+ element is as follows (taken from the function-signature
+ EBNF in web-jsptaglibrary_2_1.xsd):</p>
+
+<code>
+
+<p>MethodSignature ::= ReturnType S MethodName S? '(' S? Parameters? S? ')'</p>
+
+<p>ReturnType ::= Type</p>
+
+<p>MethodName ::= Identifier</p>
+
+<p>Parameters ::= Parameter | ( Parameter S? ',' S? Parameters )</p>
+
+<p>Parameter ::= Type</p>
+
+</code>
+
+<p>Where:</p>
+
+<ul>
+
+ <li><p><code>Type</code> is a basic type or a fully qualified
+ Java class name (including package name), as per the 'Type'
+ production in the Java Language Specification, Second Edition,
+ Chapter 18.</p></li>
+
+ <li><p><code>Identifier</code> is a Java identifier, as per the
+ 'Identifier' production in the Java Language Specification,
+ Second Edition, Chapter 18.</p></li>
+
+</ul>
+
+<p>Example:</p>
+
+<p><code>java.lang.String nickName( java.lang.String, int )</code></p>
+
+]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
@@ -321,12 +373,12 @@
<xsd:complexType name="facelet-taglib-tag-extensionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Extension element for tag It may contain
implementation specific content.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any namespace="##any"
@@ -343,14 +395,14 @@
<xsd:complexType name="facelet-taglib-functionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
If the tag library XML file contains individual function
declarations rather than pointing to a library-class or a
declaring a composite-library name, the individual functions are
enclosed in function elements.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -368,12 +420,12 @@
<xsd:complexType name="facelet-taglib-tag-behaviorType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Within a tag element, the behavior element encapsulates
information specific to a JSF Behavior.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -397,12 +449,12 @@
<xsd:complexType name="facelet-taglib-tag-behavior-extensionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Extension element for behavior. It may contain
implementation specific content.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any namespace="##any"
@@ -419,23 +471,44 @@
<xsd:complexType name="facelet-taglib-tag-componentType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[
- Within a tag element, the component element encapsulates
- information specific to a JSF UIComponent.
-
- </xsd:documentation>
+ <p><span class="changed_modified_2_2">Within</span> a tag element,
+ the component element encapsulates information specific to a JSF
+ UIComponent.</p>
+
+<div class="changed_added_2_2">
+
+<p>This element must have exactly one of
+<code><component-type></code>, <code><resource-id></code>,
+or <code><handler-class></code> among its child elements.</p>
+
+</div>
+
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:choice minOccurs="0"
maxOccurs="unbounded">
- <xsd:element name="component-type"
- type="javaee:string"/>
- <xsd:element name="resource-id"
- type="javaee:string"/>
- <xsd:element name="handler-class"
- type="javaee:fully-qualified-classType"/>
+ <xsd:element name="component-type"
+ type="javaee:string"/>
+ <xsd:element name="resource-id"
+ type="javaee:string">
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">A valid resource identifier
+ as specified in the spec prose document section
+ 2.6.1.3. For example:</p>
+
+ <p><code><resource-id>myCC/ccName.xhtml</resource-id></code></p>
+
+ ]]></xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="handler-class"
+ type="javaee:fully-qualified-classType"/>
</xsd:choice>
<xsd:element minOccurs="0"
maxOccurs="1"
@@ -453,12 +526,12 @@
<xsd:complexType name="facelet-taglib-tag-component-extensionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Extension element for component It may contain
implementation specific content.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any namespace="##any"
@@ -475,12 +548,12 @@
<xsd:complexType name="facelet-taglib-tag-converterType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Within a tag element, the converter element encapsulates
information specific to a JSF Converter.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -504,12 +577,12 @@
<xsd:complexType name="facelet-taglib-tag-converter-extensionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Extension element for converter It may contain
implementation specific content.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any namespace="##any"
@@ -526,12 +599,12 @@
<xsd:complexType name="facelet-taglib-tag-validatorType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Within a tag element, the validator element encapsulates
information specific to a JSF Validator.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -555,12 +628,12 @@
<xsd:complexType name="facelet-taglib-tag-validator-extensionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
Extension element for validator It may contain
implementation specific content.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any namespace="##any"
@@ -574,12 +647,12 @@
<xsd:simpleType name="facelet-taglib-versionType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
This type contains the recognized versions of
facelet-taglib supported.
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
<xsd:enumeration value="2.2"/>
@@ -591,14 +664,14 @@
<xsd:complexType name="facelet-taglib-canonical-nameType">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[<p>
- Defines the canonical name of a tag or attribute being
- defined.
+ <p>Defines the canonical name of a tag or attribute being
+ defined.</p>
- The name must conform to the lexical rules for an NCName
+ <p>The name must conform to the lexical rules for an NCName</p>
- </xsd:documentation>
+ </p>]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="xsd:NCName">
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_2_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_2_2.xsd
index 3d4347f..8127220 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_2_2.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_2_2.xsd
@@ -1,14 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee"
- attributeFormDefault="unqualified"
- elementFormDefault="qualified"
- targetNamespace="http://xmlns.jcp.org/xml/ns/javaee"
- version="2.2"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:include schemaLocation="javaee_7.xsd"/>
-
- <xsd:annotation>
- <xsd:documentation>
+<?xml version="1.0" encoding="utf-8" ?>
+<xsd:schema xmlns:javaee="http://xmlns.jcp.org/xml/ns/javaee" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlns.jcp.org/xml/ns/javaee" version="2.2" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+ <xsd:include schemaLocation="javaee_7.xsd" />
+ <xsd:annotation>
+ <xsd:documentation>
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
@@ -49,11 +43,12 @@
holder.
</xsd:documentation>
- </xsd:annotation>
+ </xsd:annotation>
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
+ <![CDATA[
+
<p>The XML Schema for the JavaServer Faces Application
Configuration File (Version 2.2).</p>
@@ -89,72 +84,66 @@
<xsd:element name="faces-config"
type="javaee:faces-configType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p>The "faces-config" element is the root of the configuration
information hierarchy, and contains nested elements for all
of the other configuration settings.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:unique name="faces-config-behavior-ID-uniqueness">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p>Behavior IDs must be unique within a document.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:behavior"/>
<xsd:field xpath="javaee:behavior-id"/>
</xsd:unique>
<xsd:unique name="faces-config-converter-ID-uniqueness">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p>Converter IDs must be unique within a document.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:converter"/>
<xsd:field xpath="javaee:converter-id"/>
</xsd:unique>
<xsd:unique name="faces-config-converter-for-class-uniqueness">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p>'converter-for-class' element values must be unique
within a document.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:converter"/>
<xsd:field xpath="javaee:converter-for-class"/>
</xsd:unique>
<xsd:unique name="faces-config-validator-ID-uniqueness">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Validator IDs must be unique within a document.</p>
+ <xsd:documentation><![CDATA[
+
+ <p> Validator IDs must be unique within a document.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:validator"/>
<xsd:field xpath="javaee:validator-id"/>
</xsd:unique>
<xsd:unique name="faces-config-managed-bean-name-uniqueness">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Managed bean names must be unique within a document.</p>
+ <xsd:documentation><![CDATA[
+
+ <p> Managed bean names must be unique within a document.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:selector xpath="javaee:managed-bean"/>
<xsd:field xpath="javaee:managed-bean-name"/>
@@ -166,14 +155,13 @@
<xsd:complexType name="faces-configType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "faces-config" element is the root of the configuration
+ <xsd:documentation><![CDATA[
+
+ <p> The "faces-config" element is the root of the configuration
information hierarchy, and contains nested elements for all
of the other configuration settings.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:choice minOccurs="0"
maxOccurs="unbounded">
@@ -183,7 +171,8 @@
type="javaee:faces-config-orderingType"/>
<xsd:element name="absolute-ordering"
type="javaee:faces-config-absoluteOrderingType"
- minOccurs="0"/>
+ minOccurs="0"
+ />
<xsd:element name="factory"
type="javaee:faces-config-factoryType"/>
<xsd:element name="component"
@@ -196,12 +185,13 @@
type="javaee:faces-config-flow-definitionType"/>
<xsd:element name="name"
type="javaee:java-identifierType"
- minOccurs="0">
+ minOccurs="0"
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> <span class="changed_modified_2_2">The</span> "name" element
- within the top level "faces-config"
+ <xsd:documentation><![CDATA[
+
+ <p> <span class="changed_modified_2_2">The</span> "name" element
+ within the top level "faces-config"
element declares the name of this application
configuration resource. Such names are used
in the document ordering scheme specified in section
@@ -213,8 +203,7 @@
element is not specified, the runtime must take the empty string
as its value.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="navigation-rule"
@@ -242,7 +231,7 @@
type="xsd:boolean"
use="optional">
<xsd:annotation>
- <xsd:documentation>
+ <xsd:documentation><![CDATA[
The metadata-complete attribute defines whether this
JavaServer Faces application is complete, or whether
@@ -274,7 +263,7 @@
runtime annotations such as @ResourceDependency or
@ListenerFor.
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="id"
@@ -289,13 +278,12 @@
<xsd:complexType name="faces-config-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for faces-config. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for faces-config. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -312,20 +300,21 @@
<xsd:complexType name="faces-config-orderingType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Please see section JSF.11.4.6 for the specification of this element.</p>
+ <xsd:documentation><![CDATA[
+
+ <p> Please see section JSF.11.4.6 for the specification of this element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="after"
type="javaee:faces-config-ordering-orderingType"
- minOccurs="0"/>
+ minOccurs="0"
+ />
<xsd:element name="before"
type="javaee:faces-config-ordering-orderingType"
- minOccurs="0"/>
+ minOccurs="0"
+ />
</xsd:sequence>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -336,16 +325,15 @@
<xsd:complexType name="faces-config-ordering-orderingType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> This element contains a sequence of "id" elements, each of which
+ <xsd:documentation><![CDATA[
+
+ <p> This element contains a sequence of "id" elements, each of which
refers to an application configuration resource by the "id"
declared on its faces-config element. This element can also contain
a single "others" element which specifies that this document comes
before or after other documents within the application.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name"
@@ -354,7 +342,8 @@
maxOccurs="unbounded"/>
<xsd:element name="others"
type="javaee:faces-config-ordering-othersType"
- minOccurs="0"/>
+ minOccurs="0"
+ />
</xsd:sequence>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -365,16 +354,15 @@
<xsd:complexType name="faces-config-ordering-othersType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> This element indicates that the ordering sub-element in which
+ <xsd:documentation><![CDATA[
+
+ <p> This element indicates that the ordering sub-element in which
it was placed should take special action regarding the ordering
of this application resource relative to other
application configuration resources. See section JSF.11.4.6
for the complete specification.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -385,13 +373,12 @@
<xsd:complexType name="faces-config-absoluteOrderingType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Only relevant if this is placed within the /WEB-INF/faces-config.xml.
+ <xsd:documentation><![CDATA[
+
+ <p> Only relevant if this is placed within the /WEB-INF/faces-config.xml.
Please see section JSF.11.4.6 for the specification for details.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:choice minOccurs="0"
maxOccurs="unbounded">
@@ -401,7 +388,8 @@
maxOccurs="unbounded"/>
<xsd:element name="others"
type="javaee:faces-config-ordering-othersType"
- minOccurs="0"/>
+ minOccurs="0"
+ />
</xsd:choice>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -412,68 +400,64 @@
<xsd:complexType name="faces-config-applicationType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "application" element provides a mechanism to define the
+ <xsd:documentation><![CDATA[
+
+ <p> The "application" element provides a mechanism to define the
various per-application-singleton implementation artifacts for
a particular web application that is utilizing
JavaServer Faces. For nested elements that are not specified,
the JSF implementation must provide a suitable default.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:choice minOccurs="0"
maxOccurs="unbounded">
<xsd:element name="action-listener"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "action-listener" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "action-listener" element contains the fully
qualified class name of the concrete
ActionListener implementation class that will be
called during the Invoke Application phase of the
request processing lifecycle.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="default-render-kit-id"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "default-render-kit-id" element allows the
+ <xsd:documentation><![CDATA[
+
+ <p> The "default-render-kit-id" element allows the
application to define a renderkit to be used other
than the standard one.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="message-bundle"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The base name of a resource bundle representing
+ <xsd:documentation><![CDATA[
+
+ <p> The base name of a resource bundle representing
the message resources for this application. See
the JavaDocs for the "java.util.ResourceBundle"
class for more information on the syntax of
resource bundle names.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="navigation-handler"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "navigation-handler" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "navigation-handler" element contains the
fully qualified class name of the concrete
NavigationHandler implementation class that will
be called during the Invoke Application phase
@@ -481,16 +465,15 @@
default ActionListener (provided by the JSF
implementation) is used.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="view-handler"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "view-handler" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "view-handler" element contains the fully
qualified class name of the concrete ViewHandler
implementation class that will be called during
the Restore View and Render Response phases of the
@@ -498,16 +481,15 @@
implementation must provide a default
implementation of this class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="state-manager"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "state-manager" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "state-manager" element contains the fully
qualified class name of the concrete StateManager
implementation class that will be called during
the Restore View and Render Response phases of the
@@ -515,61 +497,57 @@
implementation must provide a default
implementation of this class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="el-resolver"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "el-resolver" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "el-resolver" element contains the fully
qualified class name of the concrete
javax.el.ELResolver implementation class
that will be used during the processing of
EL expressions.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="property-resolver"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "property-resolver" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "property-resolver" element contains the fully
qualified class name of the concrete
PropertyResolver implementation class that will
be used during the processing of value binding
expressions.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="variable-resolver"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "variable-resolver" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "variable-resolver" element contains the fully
qualified class name of the concrete
VariableResolver implementation class that will
be used during the processing of value binding
expressions.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="resource-handler"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "resource-handler" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "resource-handler" element contains the
fully qualified class name of the concrete
ResourceHandler implementation class that
will be used during rendering and decoding
@@ -578,23 +556,21 @@
other application singletons will be
honored.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="resource-library-contracts"
type="javaee:faces-config-application-resource-library-contractsType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The "resource-library-contracts" element
- specifies the mappings between views in the application and resource
- library contracts that, if present in the application, must be made
- available for use as templates of the specified views.
- </p>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">The "resource-library-contracts" element
+ specifies the mappings between views in the application and resource
+ library contracts that, if present in the application, must be made
+ available for use as templates of the specified views.
+ </p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="system-event-listener"
@@ -621,9 +597,9 @@
<xsd:complexType name="faces-config-application-resource-bundleType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The resource-bundle element inside the application element
+ <xsd:documentation><![CDATA[
+
+ <p> The resource-bundle element inside the application element
references a java.util.ResourceBundle instance by name
using the var element. ResourceBundles referenced in this
manner may be returned by a call to
@@ -631,34 +607,31 @@
FacesContext for this request and the value of the var
element below.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="base-name"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The fully qualified class name of the
+ <xsd:documentation><![CDATA[
+
+ <p> The fully qualified class name of the
java.util.ResourceBundle instance.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="var"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The name by which this ResourceBundle instance
+ <xsd:documentation><![CDATA[
+
+ <p> The name by which this ResourceBundle instance
is retrieved by a call to
Application.getResourceBundle().</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -666,36 +639,32 @@
type="xsd:ID"/>
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-application-resource-library-contractsType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The "resource-library-contracts" element
- specifies the mappings between views in the application and resource
- library contracts that, if present in the application, must be made
- available for use as templates of the specified views.
- </p>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">The "resource-library-contracts" element
+ specifies the mappings between views in the application and resource
+ library contracts that, if present in the application, must be made
+ available for use as templates of the specified views.
+ </p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="contract-mapping"
type="javaee:faces-config-application-resource-library-contracts-contract-mappingType"
+
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p classes="changed_added_2_2">Declare a mapping between a collection
- of views in the application and the list of contracts (if present in the application)
- that may be used as a source for templates and resources for those views.</p>
+ <xsd:documentation><![CDATA[
+
+ <p classes="changed_added_2_2">Declare a mapping between a collection
+ of views in the application and the list of contracts (if present in the application)
+ that may be used as a source for templates and resources for those views.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -703,21 +672,17 @@
type="xsd:ID"/>
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-application-resource-library-contracts-contract-mappingType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The "contract-mapping" element
- specifies the mappings between a collection of views in the application and resource
- library contracts that, if present in the application, must be made
- available for use as templates of the specified views.
- </p>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">The "contract-mapping" element
+ specifies the mappings between a collection of views in the application and resource
+ library contracts that, if present in the application, must be made
+ available for use as templates of the specified views.
+ </p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -725,50 +690,47 @@
type="javaee:url-patternType"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The "url-pattern" element
- specifies the collection of views in this application that
- are allowed to use the corresponding contracts.
- </p>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">The "url-pattern" element
+ specifies the collection of views in this application that
+ are allowed to use the corresponding contracts.
+ </p>
+
+ ]]></xsd:documentation>
+ </xsd:annotation>
</xsd:element>
+
<xsd:element name="contracts"
type="javaee:string"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The "contracts" element
- is a comma separated list of resource library contracts that,
- if available to the application, may be used by the views
- matched by the corresponding "url-pattern"
- </p>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">The "contracts" element
+ is a comma separated list of resource library contracts that,
+ if available to the application, may be used by the views
+ matched by the corresponding "url-pattern"
+ </p>
+
+ ]]></xsd:documentation>
+ </xsd:annotation>
</xsd:element>
</xsd:sequence>
<xsd:attribute name="id"
type="xsd:ID"/>
</xsd:complexType>
-
<!-- **************************************************** -->
<xsd:complexType name="faces-config-application-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for application. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for application. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -785,218 +747,204 @@
<xsd:complexType name="faces-config-factoryType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "factory" element provides a mechanism to define the
+ <xsd:documentation><![CDATA[
+
+ <p> The "factory" element provides a mechanism to define the
various Factories that comprise parts of the implementation
of JavaServer Faces. For nested elements that are not
specified, the JSF implementation must provide a suitable
default.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:choice minOccurs="0"
maxOccurs="unbounded">
<xsd:element name="application-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "application-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "application-factory" element contains the
fully qualified class name of the concrete
ApplicationFactory implementation class that will
be called when
FactoryFinder.getFactory(APPLICATION_FACTORY) is
called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="exception-handler-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "exception-handler-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "exception-handler-factory" element contains the
fully qualified class name of the concrete
ExceptionHandlerFactory implementation class that will
be called when
FactoryFinder.getFactory(EXCEPTION_HANDLER_FACTORY)
is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="external-context-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "external-context-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "external-context-factory" element contains the
fully qualified class name of the concrete
ExternalContextFactory implementation class that will
be called when
FactoryFinder.getFactory(EXTERNAL_CONTEXT_FACTORY)
is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="faces-context-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "faces-context-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "faces-context-factory" element contains the
fully qualified class name of the concrete
FacesContextFactory implementation class that will
be called when
FactoryFinder.getFactory(FACES_CONTEXT_FACTORY)
is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="facelet-cache-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "facelet-cache-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "facelet-cache-factory" element contains the
fully qualified class name of the concrete
FaceletCacheFactory implementation class that will
be called when
FactoryFinder.getFactory(FACELET_CACHE_FACTORY)
is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="partial-view-context-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "partial-view-context-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "partial-view-context-factory" element contains the
fully qualified class name of the concrete
PartialViewContextFactory implementation class that will
be called when FactoryFinder.getFactory
(FactoryFinder.PARTIAL_VIEW_CONTEXT_FACTORY) is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="lifecycle-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "lifecycle-factory" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "lifecycle-factory" element contains the fully
qualified class name of the concrete LifecycleFactory
implementation class that will be called when
FactoryFinder.getFactory(LIFECYCLE_FACTORY) is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="view-declaration-language-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "view-declaration-language-factory" element contains
+ <xsd:documentation><![CDATA[
+
+ <p> The "view-declaration-language-factory" element contains
the fully qualified class name of the concrete
ViewDeclarationLanguageFactory
implementation class that will be called when
FactoryFinder.getFactory(VIEW_DECLARATION_FACTORY) is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="tag-handler-delegate-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "tag-handler-delegate-factory" element contains
+ <xsd:documentation><![CDATA[
+
+ <p> The "tag-handler-delegate-factory" element contains
the fully qualified class name of the concrete
ViewDeclarationLanguageFactory
implementation class that will be called when
FactoryFinder.getFactory(TAG_HANDLER_DELEGATE_FACTORY) is called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="render-kit-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "render-kit-factory" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "render-kit-factory" element contains the fully
qualified class name of the concrete RenderKitFactory
implementation class that will be called when
FactoryFinder.getFactory(RENDER_KIT_FACTORY) is
called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="visit-context-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "visit-context-factory" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "visit-context-factory" element contains the fully
qualified class name of the concrete VisitContextFactory
implementation class that will be called when
FactoryFinder.getFactory(VISIT_CONTEXT_FACTORY) is
called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="flash-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2"> The "flash-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2"> The "flash-factory" element contains the
fully qualified class name of the concrete
FaceletFactory implementation class that will
be called when
FactoryFinder.getFactory(FLASH_FACTORY) is
called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="flow-handler-factory"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "flow-handler-factory" element contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "flow-handler-factory" element contains the
fully qualified class name of the concrete
FlowHandlerFactory implementation class that will
be called when
FactoryFinder.getFactory(FLOW_HANDLER_FACTORY) is
called.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="factory-extension"
@@ -1013,13 +961,12 @@
<xsd:complexType name="faces-config-factory-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for factory. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for factory. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -1036,44 +983,41 @@
<xsd:complexType name="faces-config-attributeType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "attribute" element represents a named, typed, value
+ <xsd:documentation><![CDATA[
+
+ <p> The "attribute" element represents a named, typed, value
associated with the parent UIComponent via the generic
attributes mechanism.</p>
<p>Attribute names must be unique within the scope of the parent
(or related) component.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="attribute-name"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "attribute-name" element represents the name under
+ <xsd:documentation><![CDATA[
+
+ <p> The "attribute-name" element represents the name under
which the corresponding value will be stored, in the
generic attributes of the UIComponent we are related
to.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="attribute-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "attribute-class" element represents the Java type
+ <xsd:documentation><![CDATA[
+
+ <p> The "attribute-class" element represents the Java type
of the value associated with this attribute name.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="default-value"
@@ -1096,13 +1040,12 @@
<xsd:complexType name="faces-config-attribute-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for attribute. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for attribute. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -1119,9 +1062,9 @@
<xsd:complexType name="faces-config-componentType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "component" element represents a concrete UIComponent
+ <xsd:documentation><![CDATA[
+
+ <p> The "component" element represents a concrete UIComponent
implementation class that should be registered under the
specified type identifier, along with its associated
properties and attributes. Component types must be unique
@@ -1133,35 +1076,32 @@
the component class that may be exposed for manipulation
via tools.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="component-type"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "component-type" element represents the name under
+ <xsd:documentation><![CDATA[
+
+ <p> The "component-type" element represents the name under
which the corresponding UIComponent class should be
registered.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="component-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "component-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "component-class" element represents the fully
qualified class name of a concrete UIComponent
implementation class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="facet"
@@ -1190,13 +1130,12 @@
<xsd:complexType name="faces-config-component-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for component. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for component. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -1213,17 +1152,16 @@
<xsd:complexType name="faces-config-default-localeType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "default-locale" element declares the default locale
+ <xsd:documentation><![CDATA[
+
+ <p> The "default-locale" element declares the default locale
for this application instance.</p>
<p>It must be specified as :language:[_:country:[_:variant:]]
without the colons, for example "ja_JP_SJIS". The
separators between the segments may be '-' or '_'.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="javaee:faces-config-localeType">
@@ -1238,16 +1176,15 @@
<xsd:complexType name="faces-config-default-valueType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "default-value" contains the value for the property or
+ <xsd:documentation><![CDATA[
+
+ <p> The "default-value" contains the value for the property or
attribute in which this element resides. This value differs
from the "suggested-value" in that the property or attribute
must take the value, whereas in "suggested-value" taking the
value is optional.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="javaee:string">
@@ -1259,14 +1196,13 @@
<xsd:simpleType name="faces-config-el-expressionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> EL expressions present within a faces config file
+ <xsd:documentation><![CDATA[
+
+ <p> EL expressions present within a faces config file
must start with the character sequence of '#{' and
end with '}'.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:pattern value="#\{.*\}"/>
@@ -1278,27 +1214,25 @@
<xsd:complexType name="faces-config-facetType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Define the name and other design-time information for a facet
+ <xsd:documentation><![CDATA[
+
+ <p> Define the name and other design-time information for a facet
that is associated with a renderer or a component.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="facet-name"
type="javaee:java-identifierType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "facet-name" element represents the facet name
+ <xsd:documentation><![CDATA[
+
+ <p> The "facet-name" element represents the facet name
under which a UIComponent will be added to its parent.
It must be of type "Identifier".</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="facet-extension"
@@ -1315,13 +1249,12 @@
<xsd:complexType name="faces-config-facet-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for facet. It may contain implementation
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for facet. It may contain implementation
specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -1338,14 +1271,14 @@
<xsd:complexType name="faces-config-from-view-idType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p><span class="changed_modified_2_2">The</span>
- value of from-view-id must contain one of the following
+ <xsd:documentation><![CDATA[
+
+ <p><span class="changed_modified_2_2">The</span>
+ value of from-view-id must contain one of the following
values:</p>
<ul>
-
+
<li><p>The exact match for a view identifier that is recognized
by the the ViewHandler implementation being used (such as
"/index.jsp" if you are using the default ViewHandler).</p></li>
@@ -1353,20 +1286,19 @@
<li><p class="changed_added_2_2">The exact match of a flow node id
in the current flow, or a flow id of another flow.</p></li>
- <li><p> A proper prefix of a view identifier, plus a trailing
- "*" character. This pattern indicates that all view
- identifiers that match the portion of the pattern up to the
- asterisk will match the surrounding rule. When more than one
- match exists, the match with the longest pattern is selected.
- </p></li>
+ <li><p> A proper prefix of a view identifier, plus a trailing
+ "*" character. This pattern indicates that all view
+ identifiers that match the portion of the pattern up to the
+ asterisk will match the surrounding rule. When more than one
+ match exists, the match with the longest pattern is selected.
+ </p></li>
<li><p>An "*" character, which means that this pattern applies
to all view identifiers. </p></li>
+
+ </ul>
- </ul>
-
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="javaee:string">
@@ -1381,17 +1313,16 @@
<xsd:complexType name="faces-config-from-actionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "from-action" element contains an action reference
+ <xsd:documentation><![CDATA[
+
+ <p> The "from-action" element contains an action reference
expression that must have been executed (by the default
ActionListener for handling application level events)
in order to select the navigation rule. If not specified,
this rule will be relevant no matter which action reference
was executed (or if no action reference was executed).</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="javaee:faces-config-el-expressionType">
@@ -1406,8 +1337,8 @@
<xsd:complexType name="faces-config-ifType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p>The "if" element defines a condition that must resolve
to true in order for the navigation case on which it is
defined to be matched, with the existing match criteria
@@ -1419,19 +1350,19 @@
present, the navigation handler will match a null outcome
and use the condition return value to determine if the
case should be considered a match.</p>
+
+<div class="changed_added_2_2">
+
+<p>When used in a <code><switch></code> within a flow, if the
+expresion returns <code>true</code>, the
+<code><from-outcome></code> sibling element's outcome is used as
+the id of the node in the flow graph to which control must be
+passed.</p>
+
+</div>
- <div class="changed_added_2_2">
- <p>When used in a <code><switch></code> within a flow, if the
- expresion returns <code>true</code>, the
- <code><from-outcome></code> sibling element's outcome is used as
- the id of the node in the flow graph to which control must be
- passed.</p>
-
- </div>
-
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="javaee:faces-config-el-expressionType">
@@ -1441,21 +1372,22 @@
</xsd:simpleContent>
</xsd:complexType>
-
<!-- **************************************************** -->
<xsd:complexType name="faces-config-flow-definition-parameter-valueType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p class="changed_added_2_2"></p>
+
+<div class="changed_added_2_2">
+
+
+
+</div>
- <div class="changed_added_2_2">
- </div>
-
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="javaee:faces-config-el-expressionType">
@@ -1470,9 +1402,9 @@
<xsd:complexType name="faces-config-converterType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "converter" element represents a concrete Converter
+ <xsd:documentation><![CDATA[
+
+ <p> The "converter" element represents a concrete Converter
implementation class that should be registered under the
specified converter identifier. Converter identifiers must
be unique within the entire web application.</p>
@@ -1487,8 +1419,7 @@
more completely describe their components to tools and users.
These elements have no required runtime semantics.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -1496,41 +1427,38 @@
<xsd:element name="converter-id"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "converter-id" element represents the
+ <xsd:documentation><![CDATA[
+
+ <p> The "converter-id" element represents the
identifier under which the corresponding
Converter class should be registered.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="converter-for-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "converter-for-class" element represents the
+ <xsd:documentation><![CDATA[
+
+ <p> The "converter-for-class" element represents the
fully qualified class name for which a Converter
class will be registered.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:choice>
<xsd:element name="converter-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "converter-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "converter-class" element represents the fully
qualified class name of a concrete Converter
implementation class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="attribute"
@@ -1538,17 +1466,16 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Nested "attribute" elements identify generic
+ <xsd:documentation><![CDATA[
+
+ <p> Nested "attribute" elements identify generic
attributes that may be configured on the
corresponding UIComponent in order to affect the
operation of the Converter. This attribute is
primarily for design-time tools and is not
specified to have any meaning at runtime.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="property"
@@ -1556,17 +1483,16 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Nested "property" elements identify JavaBeans
+ <xsd:documentation><![CDATA[
+
+ <p> Nested "property" elements identify JavaBeans
properties of the Converter implementation class
that may be configured to affect the operation of
the Converter. This attribute is primarily for
design-time tools and is not specified to have
any meaning at runtime.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="converter-extension"
@@ -1583,13 +1509,12 @@
<xsd:complexType name="faces-config-converter-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for converter. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for converter. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -1606,14 +1531,13 @@
<xsd:complexType name="faces-config-lifecycleType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "lifecycle" element provides a mechanism to specify
+ <xsd:documentation><![CDATA[
+
+ <p> The "lifecycle" element provides a mechanism to specify
modifications to the behaviour of the default Lifecycle
implementation for this web application.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="phase-listener"
@@ -1621,15 +1545,14 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "phase-listener" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "phase-listener" element contains the fully
qualified class name of the concrete PhaseListener
implementation class that will be registered on
the Lifecycle.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="lifecycle-extension"
@@ -1646,13 +1569,12 @@
<xsd:complexType name="faces-config-lifecycle-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for lifecycle. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for lifecycle. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -1666,13 +1588,12 @@
<xsd:simpleType name="faces-config-localeType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The localeType defines valid locale defined by ISO-639-1
+ <xsd:documentation><![CDATA[
+
+ <p> The localeType defines valid locale defined by ISO-639-1
and ISO-3166.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:string">
<xsd:pattern value="([a-z]{2})[_|\-]?([\p{L}]{2})?[_|\-]?(\w+)?"/>
@@ -1684,13 +1605,12 @@
<xsd:complexType name="faces-config-locale-configType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "locale-config" element allows the app developer to
+ <xsd:documentation><![CDATA[
+
+ <p> The "locale-config" element allows the app developer to
declare the supported locales for this application.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="default-locale"
@@ -1710,15 +1630,14 @@
<xsd:complexType name="faces-config-default-validatorsType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "default-validators" element allows the app developer to
+ <xsd:documentation><![CDATA[
+
+ <p> The "default-validators" element allows the app developer to
register a set of validators, referenced by identifier, that
are automatically assigned to any EditableValueHolder component
in the application, unless overridden or disabled locally.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="validator-id"
@@ -1726,13 +1645,12 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "validator-id" element represents the identifier
+ <xsd:documentation><![CDATA[
+
+ <p> The "validator-id" element represents the identifier
of a registered validator.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -1745,9 +1663,9 @@
<xsd:complexType name="faces-config-managed-beanType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "managed-bean" element represents a JavaBean, of a
+ <xsd:documentation><![CDATA[
+
+ <p> The "managed-bean" element represents a JavaBean, of a
particular class, that will be dynamically instantiated
at runtime (by the default VariableResolver implementation)
if it is referenced as the first element of a value binding
@@ -1758,31 +1676,29 @@
initialize the contents of settable JavaBeans properties of
the created instance.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="managed-bean-name"
type="javaee:java-identifierType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "managed-bean-name" element represents the
+ <xsd:documentation><![CDATA[
+
+ <p> The "managed-bean-name" element represents the
attribute name under which a managed bean will
be searched for, as well as stored (unless the
"managed-bean-scope" value is "none").</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="managed-bean-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "managed-bean-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "managed-bean-class" element represents the fully
qualified class name of the Java class that will be
used`to instantiate a new instance if creation of the
specified`managed bean is requested.</p>
@@ -1792,22 +1708,20 @@
zero-arguments constructor, and zero or more public
property setters.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="managed-bean-scope"
type="javaee:faces-config-managed-bean-scopeOrNoneType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "managed-bean-scope" element represents the scope
+ <xsd:documentation><![CDATA[
+
+ <p> The "managed-bean-scope" element represents the scope
into which a newly created instance of the specified
managed bean will be stored (unless the value is
"none").</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice>
@@ -1829,9 +1743,9 @@
type="xsd:boolean"
use="optional">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> This attribute is only considered when associated with
+ <xsd:documentation><![CDATA[
+
+ <p> This attribute is only considered when associated with
an application-scoped managed bean. If the value of the eager
attribute is true the runtime must instantiate this class
and store the instance within the application scope when the
@@ -1841,59 +1755,63 @@
instantiation and scoped storage of the managed bean
will occur.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="id"
type="xsd:ID"/>
</xsd:complexType>
-
<!-- **************************************************** -->
<xsd:complexType name="faces-config-flow-definitionType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
+<![CDATA[
+
<p class="changed_added_2_2">Top level element for a flow
definition.</p>
-
- <div class="changed_added_2_2">
-
- <p>If there is no <code><start-node></code> element declared, it
- is assumed to be <code><flowName>.xhtml</code>.</p>
-
- </div>
-
- ]]>
- </xsd:documentation>
+
+<div class="changed_added_2_2">
+
+<p>If there is no <code><start-node></code> element declared, it
+is assumed to be <code><flowName>.xhtml</code>.</p>
+
+</div>
+
+]]>
+</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="start-node"
type="javaee:java-identifierType"
- minOccurs="0">
+ minOccurs="0"
+ >
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Declare the id of the starting node in the
- flow graph. The start node may be any of the node types mentioned in
- the class javadocs for <code><a target="_"
- href="javax/faces/flow/FlowHandler.html">FlowHandler</a></code>.</p>
-
- ]]>
+
+ <![CDATA[
+
+<p class="changed_added_2_2">Declare the id of the starting node in the
+flow graph. The start node may be any of the node types mentioned in
+the class javadocs for <code><a target="_"
+href="javax/faces/flow/FlowHandler.html">FlowHandler</a></code>.</p>
+
+]]>
+
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="view"
type="javaee:faces-config-flow-definition-viewType"
minOccurs="0"
- maxOccurs="unbounded"/>
+ maxOccurs="unbounded" />
<xsd:element name="switch"
type="javaee:faces-config-flow-definition-switchType"
minOccurs="0"
- maxOccurs="unbounded"/>
+ maxOccurs="unbounded" />
<xsd:element name="flow-return"
type="javaee:faces-config-flow-definition-flow-returnType"
minOccurs="0"
@@ -1912,62 +1830,79 @@
maxOccurs="unbounded"/>
<xsd:element name="initializer"
type="javaee:faces-config-flow-definition-initializerType"
- minOccurs="0"/>
+ minOccurs="0"
+ />
<xsd:element name="finalizer"
type="javaee:faces-config-flow-definition-finalizerType"
- minOccurs="0"/>
+ minOccurs="0"
+ />
<xsd:element name="inbound-parameter"
type="javaee:faces-config-flow-definition-inbound-parameterType"
minOccurs="0"
maxOccurs="unbounded"/>
+
</xsd:sequence>
<xsd:attribute name="id"
- type="xsd:ID"
- use="required">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The id of this flow. The id
- must be unique within the Application configuration Resource
- file in which this flow is defined. The value of this attribute,
- combined with the value of the <faces-config><name> element
- must globally identify the flow within the application.<p>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="faces-config-flow-definition-faces-method-callType">
- <xsd:sequence>
- <xsd:element name="method"
- type="javaee:faces-config-flow-definition-faces-method-call-methodType"/>
- <xsd:element name="default-outcome"
- type="javaee:string"/>
- <xsd:element name="parameter"
- type="javaee:faces-config-flow-definition-flow-call-parameterType"
- minOccurs="0"
- maxOccurs="unbounded">
+ type="xsd:ID" use="required">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">A parameter to pass when calling the method
- identified in the "method" element that is a sibling of this element.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">The id of this flow. The id
+ must be unique within the Application configuration Resource
+ file in which this flow is defined. The value of this attribute,
+ combined with the value of the <faces-config><name> element
+ must globally identify the flow within the application.<p> ]]>
+
+
</xsd:documentation>
</xsd:annotation>
- </xsd:element>
- </xsd:sequence>
+
+ </xsd:attribute>
</xsd:complexType>
+
+ <xsd:complexType name="faces-config-flow-definition-faces-method-callType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ <p class="changed_added_2_2">Invoke a method, passing parameters if necessary.
+ The return from the method is used as the outcome for where to go next in the
+ flow. If the method is a void method, the default outcome is used.<p> ]]>
-<!-- **************************************************** -->
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="method"
+ type="javaee:faces-config-flow-definition-faces-method-call-methodType"
+
+ />
+ <xsd:element name="default-outcome"
+ type="javaee:string"
+
+ />
+ <xsd:element name="parameter"
+ type="javaee:faces-config-flow-definition-flow-call-parameterType"
+ minOccurs="0" maxOccurs="unbounded">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ <p class="changed_added_2_2">A parameter to pass when calling the method
+ identified in the "method" element that is a sibling of this element.<p>
+
+ ]]>
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+
<xsd:complexType name="faces-config-flow-definition-faces-method-call-methodType">
<xsd:simpleContent>
<xsd:extension base="javaee:faces-config-el-expressionType">
@@ -1975,65 +1910,69 @@
type="xsd:ID"/>
</xsd:extension>
</xsd:simpleContent>
+
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-flow-call-parameterType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">A parameter to pass when calling the method
- identified in the "method" element that is a sibling of this element.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">A parameter to pass when calling the method
+ identified in the "method" element that is a sibling of this element.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="class"
type="javaee:string"
- minOccurs="0">
+ minOccurs="0"
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2"> The optional "class" element within a "parameter" element
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2"> The optional "class" element within a "parameter" element
will be interpreted as the fully qualified class name for the type
of the "value" element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="value"
- type="javaee:faces-config-flow-definition-parameter-valueType">
+ type="javaee:faces-config-flow-definition-parameter-valueType"
+
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2"> The "value" element within an "parameter"
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2"> The "value" element within an "parameter"
must be a literal string or an EL Expression whose "get" will be called when the "method"
associated with this element is invoked.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
+
</xsd:element>
</xsd:sequence>
</xsd:complexType>
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-viewType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Define a view node in a flow graph.</p>
-
- <p>This element must contain exactly one
- <code><vdl-document></code> element.</p>
-
- ]]>
+
+ <![CDATA[
+
+<p class="changed_added_2_2">Define a view node in a flow graph.</p>
+
+<p>This element must contain exactly one
+<code><vdl-document></code> element.</p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -2041,10 +1980,13 @@
type="javaee:java-identifierType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Define the vdl-document for the enclosing view.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">Define the vdl-document for the enclosing view.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2052,39 +1994,40 @@
<xsd:attribute name="id"
type="xsd:ID"
use="required">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The id of this view. It must be
- unique within the flow.</p>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
+ <xsd:annotation>
+ <xsd:documentation>
+<![CDATA[
+
+ <p class="changed_added_2_2">The id of this view. It must be
+ unique within the flow.</p>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
</xsd:attribute>
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-switchType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Define a switch node in a flow graph.</p>
-
- <div class="changed_added_2_2">
-
- <p>This element must contain one or more
- <code><case></code> elements. When control passes to the
- <code><switch></code> node, each of the cases must be considered
- in order and control must past to the <code><from-outcome></code>
- of the first one whose <code><if></code> expression evaluates to
- <code>true</code>.</p>
-
- </div>
-
- ]]>
+
+ <![CDATA[
+
+<p class="changed_added_2_2">Define a switch node in a flow graph.</p>
+
+<div class="changed_added_2_2">
+
+<p>This element must contain one or more
+<code><case></code> elements. When control passes to the
+<code><switch></code> node, each of the cases must be considered
+in order and control must past to the <code><from-outcome></code>
+of the first one whose <code><if></code> expression evaluates to
+<code>true</code>.</p>
+
+</div>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
@@ -2094,26 +2037,33 @@
maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Defines a case that must be
- considered in the list of cases in the
- <code><switch></code>.</p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">Defines a case that must be
+ considered in the list of cases in the
+ <code><switch></code>.</p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="default-outcome"
type="javaee:string"
- minOccurs="0">
+ minOccurs="0"
+ >
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Defines the default case that will
- be taken if none of the other cases in the
- <code><switch></code> are taken.</p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">Defines the default case that will
+ be taken if none of the other cases in the
+ <code><switch></code> are taken.</p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2121,30 +2071,28 @@
<xsd:attribute name="id"
type="xsd:ID"
use="required">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The id of this switch. It must be
- unique within the flow.</p>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
+ <xsd:annotation>
+ <xsd:documentation>
+<![CDATA[
+
+ <p class="changed_added_2_2">The id of this switch. It must be
+ unique within the flow.</p>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
</xsd:attribute>
</xsd:complexType>
-
-
-<!-- **************************************************** -->
-
+
<xsd:complexType name="faces-config-flow-definition-switch-caseType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Defines a case that will
- be considered in the <code><switch></code>.</p>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">Defines a case that will
+ be considered in the <code><switch></code>.</p>
+
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -2152,22 +2100,21 @@
type="javaee:faces-config-ifType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">If this EL expression evaluates to
- <code>true</code>, the corresponding <code>from-outcome</code> will
- be the outcome taken by the enclosing <code><switch></code></p>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">If this EL expression evaluates to
+ <code>true</code>, the corresponding <code>from-outcome</code> will
+ be the outcome taken by the enclosing <code><switch></code></p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="from-outcome"
type="javaee:string"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p>The "from-outcome" element contains a logical outcome
string returned by the execution of an application
action method selected via an "actionRef" property
@@ -2180,11 +2127,13 @@
for any outcome value, with the assumption that the
condition specified in the "if" element ultimately
determines if this rule is a match.</p>
+
+<p class="changed_added_2_2">If used in a faces flow, this element
+represents the node id to which control will be passed.</p>
+
+
+]]>
- <p class="changed_added_2_2">If used in a faces flow, this element
- represents the node id to which control will be passed.</p>
-
- ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2193,164 +2142,182 @@
type="xsd:ID">
</xsd:attribute>
</xsd:complexType>
-
-
-<!-- **************************************************** -->
-
+
<xsd:complexType name="faces-config-flow-definition-flow-returnType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Define a return node in a flow graph.</p>
-
- <div class="changed_added_2_2">
-
- <p>This element must contain exactly one <code><from-outcome></code> element.</p>
- </div>
-
- ]]>
+
+ <![CDATA[
+
+<p class="changed_added_2_2">Define a return node in a flow graph.</p>
+
+<div class="changed_added_2_2">
+
+<p>This element must contain exactly one <code><from-outcome></code> element.</p>
+</div>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
+
<xsd:sequence>
<xsd:element name="from-outcome"
- type="javaee:string">
+ type="javaee:string"
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">This element
- represents the node id to which control will be passed.</p>
+ <xsd:documentation><![CDATA[
+
+<p class="changed_added_2_2">This element
+represents the node id to which control will be passed.</p>
+
+
+]]>
- ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
+
<xsd:attribute name="id"
type="xsd:ID"
use="required">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The id of this flow-return.</p>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
+ <xsd:annotation>
+ <xsd:documentation>
+<![CDATA[
+
+ <p class="changed_added_2_2">The id of this flow-return.</p>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
</xsd:attribute>
+
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-flow-callType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Define a call node in a flow graph.</p>
-
- <div class="changed_added_2_2">
-
- <p>This element must contain exactly one <code><flow-reference></code> element,
- which must contain exactly one <code><flow-id></code> element.</p>
- </div>
-
- ]]>
+
+ <![CDATA[
+
+<p class="changed_added_2_2">Define a call node in a flow graph.</p>
+
+<div class="changed_added_2_2">
+
+<p>This element must contain exactly one <code><flow-reference></code> element,
+which must contain exactly one <code><flow-id></code> element.</p>
+</div>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
+
<xsd:sequence>
<xsd:element name="flow-reference"
- type="javaee:faces-config-flow-definition-flow-call-flow-referenceType">
+ type="javaee:faces-config-flow-definition-flow-call-flow-referenceType"
+ >
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The flow id of the called flow.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">The flow id of the called flow.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="outbound-parameter"
type="javaee:faces-config-flow-definition-flow-call-outbound-parameterType"
- minOccurs="0"
- maxOccurs="unbounded">
+ minOccurs="0" maxOccurs="unbounded">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">A parameter to pass when calling the flow
- identified in the "flow-reference" element that is a sibling of this element.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">A parameter to pass when calling the flow
+ identified in the "flow-reference" element that is a sibling of this element.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
+
<xsd:attribute name="id"
type="xsd:ID"
use="required">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">The id of this flow-return.</p>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
+ <xsd:annotation>
+ <xsd:documentation>
+<![CDATA[
+
+ <p class="changed_added_2_2">The id of this flow-return.</p>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
</xsd:attribute>
+
</xsd:complexType>
-
-
-<!-- **************************************************** -->
-
+
<xsd:complexType name="faces-config-flow-definition-flow-call-flow-referenceType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Identifiy the called flow.</p>
-
- <div class="changed_added_2_2">
-
- </div>
-
- ]]>
+
+ <![CDATA[
+
+<p class="changed_added_2_2">Identifiy the called flow.</p>
+
+<div class="changed_added_2_2">
+
+</div>
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="flow-document-id"
type="javaee:java-identifierType"
- minOccurs="0">
+ minOccurs="0"
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p>The document id of the called flow.</p>
+ <xsd:documentation><![CDATA[
+
+ <p>The document id of the called flow.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
+
<xsd:element name="flow-id"
- type="javaee:java-identifierType">
+ type="javaee:java-identifierType"
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p>The id of the called flow.</p>
+ <xsd:documentation><![CDATA[
+
+ <p>The id of the called flow.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
+
</xsd:sequence>
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-initializerType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">A <code>MethodExpression</code> that will be invoked when the flow is entered.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">A <code>MethodExpression</code> that will be invoked when the flow is entered.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2361,16 +2328,16 @@
</xsd:simpleContent>
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-finalizerType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">A <code>MethodExpression</code> that will be invoked when the flow is exited.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">A <code>MethodExpression</code> that will be invoked when the flow is exited.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
@@ -2381,107 +2348,111 @@
</xsd:simpleContent>
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-inbound-parameterType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">A named parameter whose value will be populated
- with a correspondingly named parameter within an "outbound-parameter" element.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">A named parameter whose value will be populated
+ with a correspondingly named parameter within an "outbound-parameter" element.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name"
- type="javaee:java-identifierType">
+ type="javaee:java-identifierType"
+
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2"> The "name" element within an "inbound-parameter"
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2"> The "name" element within an "inbound-parameter"
element declares the name of this parameter
to be passed into a flow. There must be
a sibling "value" element in the same parent as this element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="value"
- type="javaee:faces-config-flow-definition-parameter-valueType">
+ type="javaee:faces-config-flow-definition-parameter-valueType"
+
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2"> The "value" element within an "inbound-parameter"
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2"> The "value" element within an "inbound-parameter"
must be an EL Expression whose value will be set with the correspondingly
named "outbound-parameter" when this flow is entered, if such a
parameter exists.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
+
</xsd:element>
</xsd:sequence>
</xsd:complexType>
-
-<!-- **************************************************** -->
-
<xsd:complexType name="faces-config-flow-definition-flow-call-outbound-parameterType">
<xsd:annotation>
<xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">A named parameter whose value will be
- passed to a correspondingly named parameter within an "inbound-parameter" element
- on the target flow.<p>
-
- ]]>
+
+ <![CDATA[
+
+ <p class="changed_added_2_2">A named parameter whose value will be
+ passed to a correspondingly named parameter within an "inbound-parameter" element
+ on the target flow.<p>
+
+]]>
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name"
- type="javaee:java-identifierType">
+ type="javaee:java-identifierType"
+
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2"> The "name" element within an "outbound-parameter" element
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2"> The "name" element within an "outbound-parameter" element
declares the name of this parameter to be passed out of a flow. There must be
a sibling "value" element in the same parent as this element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="value"
- type="javaee:faces-config-flow-definition-parameter-valueType">
+ type="javaee:faces-config-flow-definition-parameter-valueType"
+
+ >
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2"> The "value" element within an "outbound-parameter"
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2"> The "value" element within an "outbound-parameter"
must be a literal string or an EL Expression whose "get" will be called when the "flow-call"
containing this element is traversed to go to a new flow.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
+
</xsd:element>
</xsd:sequence>
</xsd:complexType>
-
<!-- **************************************************** -->
<xsd:complexType name="faces-config-managed-bean-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for managed-bean. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for managed-bean. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -2500,9 +2471,8 @@
<xsd:annotation>
<xsd:documentation>
<![CDATA[[
- [
-
- <p> Defines the legal values for the <managed-bean-scope>
+
+ <p> Defines the legal values for the <managed-bean-scope>
element's body content, which includes all of the scopes
normally used in a web application, plus the "none" value
indicating that a created bean should not be stored into
@@ -2525,46 +2495,43 @@
<xsd:complexType name="faces-config-managed-propertyType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "managed-property" element represents an individual
+ <xsd:documentation><![CDATA[
+
+ <p> The "managed-property" element represents an individual
property of a managed bean that will be configured to the
specified value (or value set) if the corresponding
managed bean is automatically created.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="property-name"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "property-name" element represents the JavaBeans
+ <xsd:documentation><![CDATA[
+
+ <p> The "property-name" element represents the JavaBeans
property name under which the corresponding value may
be stored.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="property-class"
type="javaee:java-typeType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "property-class" element represents the Java type
+ <xsd:documentation><![CDATA[
+
+ <p> The "property-class" element represents the Java type
of the value associated with this property name.
If not specified, it can be inferred from existing
classes; however, this element should be specified
if the configuration file is going to be the source
for generating the corresponding classes.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice>
@@ -2587,27 +2554,25 @@
<xsd:complexType name="faces-config-map-entryType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "map-entry" element reprsents a single key-entry pair
+ <xsd:documentation><![CDATA[
+
+ <p> The "map-entry" element reprsents a single key-entry pair
that will be added to the computed value of a managed
property of type java.util.Map.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="key"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "key" element is the String representation of a
+ <xsd:documentation><![CDATA[
+
+ <p> The "key" element is the String representation of a
map key that will be stored in a managed property of
type java.util.Map.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:choice>
@@ -2626,30 +2591,28 @@
<xsd:complexType name="faces-config-map-entriesType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "map-entries' element represents a set of key-entry pairs
+ <xsd:documentation><![CDATA[
+
+ <p> The "map-entries' element represents a set of key-entry pairs
that will be added to the computed value of a managed property
of type java.util.Map. In addition, the Java class types
of the key and entry values may be optionally declared.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="key-class"
type="javaee:fully-qualified-classType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "key-class" element defines the Java type to which
+ <xsd:documentation><![CDATA[
+
+ <p> The "key-class" element defines the Java type to which
each "key" element in a set of "map-entry" elements
will be converted to. If omitted, "java.lang.String"
is assumed.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="value-class"
@@ -2669,15 +2632,15 @@
<xsd:complexType name="faces-config-navigation-caseType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "navigation-case" element describes a particular
+ <xsd:documentation><![CDATA[
+
+ <p> <span class="changed_modified_2_2">The</span>
+ "navigation-case" element describes a particular
combination of conditions that must match for this case to
be executed, and the view id of the component tree that
should be selected next.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -2688,8 +2651,8 @@
type="javaee:string"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
+ <xsd:documentation><![CDATA[
+
<p>The "from-outcome" element contains a logical outcome
string returned by the execution of an application
action method selected via an "actionRef" property
@@ -2702,8 +2665,9 @@
for any outcome value, with the assumption that the
condition specified in the "if" element ultimately
determines if this rule is a match.</p>
+
+]]>
- ]]>
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@@ -2711,20 +2675,19 @@
type="javaee:faces-config-ifType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Please see section JSF.7.4.2 for the specification of this element.</p>
+ <xsd:documentation><![CDATA[
+
+ <p> Please see section JSF.7.4.2 for the specification of this element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="to-view-id"
type="javaee:faces-config-valueType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p><span class="changed_modified_2_2">The "to-view-id" element
+ <xsd:documentation><![CDATA[
+
+ <p><span class="changed_modified_2_2">The "to-view-id" element
contains the view identifier (<span class="changed_added_2_2">or
flow node id, or flow id</span>)
of the next view (<span class="changed_added_2_2">or flow node or
@@ -2735,21 +2698,24 @@
<span class="changed_added_2_2">or flow node or flow</span>)
identifier.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="to-flow-document-id"
- type="javaee:java-identifierType"
- minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p>The document id of the called flow.</p>
+ type="javaee:java-identifierType"
+ minOccurs="0"
+ >
+ <xsd:annotation>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">The document id of the called flow.
+ If this element appears in a <navigation-case> nested within
+ a <flow-definition>, it must be ignored because navigation
+ cases within flows may only navigate among the view nodes of that
+ flow.</p>
- ]]>
- </xsd:documentation>
- </xsd:annotation>
+ ]]></xsd:documentation>
+ </xsd:annotation>
</xsd:element>
<xsd:element name="redirect"
type="javaee:faces-config-redirectType"
@@ -2764,22 +2730,21 @@
<xsd:complexType name="faces-config-navigation-ruleType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "navigation-rule" element represents an individual
+ <xsd:documentation><![CDATA[
+
+ <p> The "navigation-rule" element represents an individual
decision rule that will be utilized by the default
NavigationHandler implementation to make decisions on
what view should be displayed next, based on the
view id being processed.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="from-view-id"
type="javaee:faces-config-from-view-idType"
- minOccurs="0"/>
+ />
<xsd:element name="navigation-case"
type="javaee:faces-config-navigation-caseType"
minOccurs="0"
@@ -2798,13 +2763,12 @@
<xsd:complexType name="faces-config-navigation-rule-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for navigation-rule. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for navigation-rule. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -2821,9 +2785,9 @@
<xsd:complexType name="faces-config-null-valueType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "null-value" element indicates that the managed
+ <xsd:documentation><![CDATA[
+
+ <p> The "null-value" element indicates that the managed
property in which we are nested will be explicitly
set to null if our managed bean is automatically
created. This is different from omitting the managed
@@ -2834,8 +2798,7 @@
associated "property-class" identifies a Java class,
not a Java primitive.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -2846,9 +2809,9 @@
<xsd:complexType name="faces-config-propertyType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "property" element represents a JavaBean property of the
+ <xsd:documentation><![CDATA[
+
+ <p> The "property" element represents a JavaBean property of the
Java class represented by our parent element.</p>
<p>Property names must be unique within the scope of the Java
@@ -2857,38 +2820,35 @@
performing introspection against that class via
java.beans.Introspector.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="property-name"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "property-name" element represents the JavaBeans
+ <xsd:documentation><![CDATA[
+
+ <p> The "property-name" element represents the JavaBeans
property name under which the corresponding value
may be stored.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="property-class"
type="javaee:java-typeType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "property-class" element represents the Java type
+ <xsd:documentation><![CDATA[
+
+ <p> The "property-class" element represents the Java type
of the value associated with this property name.
If not specified, it can be inferred from existing
classes; however, this element should be specified if
the configuration file is going to be the source for
generating the corresponding classes.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="default-value"
@@ -2911,17 +2871,16 @@
<xsd:complexType name="faces-config-protected-viewsType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p class="changed_added_2_2">Any view that matches any of the
- url-patterns in this element may only be reached from another JSF
- view in the same web application. Because the runtime is aware of
- which views are protected, any navigation from an unprotected
- view to a protected view is automatically subject to
- protection.</p>
+ <xsd:documentation><![CDATA[
+
+ <p class="changed_added_2_2">Any view that matches any of the
+ url-patterns in this element may only be reached from another JSF
+ view in the same web application. Because the runtime is aware of
+ which views are protected, any navigation from an unprotected
+ view to a protected view is automatically subject to
+ protection.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="url-pattern"
@@ -2935,13 +2894,12 @@
<xsd:complexType name="faces-config-property-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for property. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for property. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -2958,21 +2916,16 @@
<xsd:complexType name="faces-config-redirectType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "redirect" element indicates that navigation to the
+ <xsd:documentation><![CDATA[
+
+ <p> The "redirect" element indicates that navigation to the
specified "to-view-id" should be accomplished by
performing an HTTP redirect rather than the usual
ViewHandler mechanisms.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
- <xsd:element name="view-param"
- type="javaee:faces-config-redirect-viewParamType"
- minOccurs="0"
- maxOccurs="unbounded"/>
<xsd:element name="redirect-param"
type="javaee:faces-config-redirect-redirectParamType"
minOccurs="0"
@@ -2990,9 +2943,9 @@
<xsd:complexType name="faces-config-redirect-viewParamType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> This element was introduced due to a specification
+ <xsd:documentation><![CDATA[
+
+ <p> This element was introduced due to a specification
error, and is now deprecated. The correct name for
this element is "redirect-param" and its meaning is
documented therein. The "view-param" element is
@@ -3000,14 +2953,17 @@
Implementations must treat this element the same as
"redirect-param".</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name"
- type="javaee:string"/>
+ type="javaee:string"
+
+ />
<xsd:element name="value"
- type="javaee:string"/>
+ type="javaee:string"
+
+ />
</xsd:sequence>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -3018,21 +2974,24 @@
<xsd:complexType name="faces-config-redirect-redirectParamType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "redirect-param" element, only valid within
+ <xsd:documentation><![CDATA[
+
+ <p> The "redirect-param" element, only valid within
a "redirect" element, contains child "name"
and "value" elements that must be included in the
redirect url when the redirect is performed.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="name"
- type="javaee:string"/>
+ type="javaee:string"
+
+ />
<xsd:element name="value"
- type="javaee:string"/>
+ type="javaee:string"
+
+ />
</xsd:sequence>
<xsd:attribute name="id"
type="xsd:ID"/>
@@ -3043,9 +3002,9 @@
<xsd:complexType name="faces-config-referenced-beanType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "referenced-bean" element represents at design time the
+ <xsd:documentation><![CDATA[
+
+ <p> The "referenced-bean" element represents at design time the
promise that a Java object of the specified type will exist at
runtime in some scope, under the specified key. This can be
used by design time tools to construct user interface dialogs
@@ -3053,38 +3012,35 @@
or absence of a referenced bean element has no impact on the
JavaServer Faces runtime environment inside a web application.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="referenced-bean-name"
type="javaee:java-identifierType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "referenced-bean-name" element represents the
+ <xsd:documentation><![CDATA[
+
+ <p> The "referenced-bean-name" element represents the
attribute name under which the corresponding
referenced bean may be assumed to be stored, in one
of 'request', 'session', 'view', 'application'
or a custom scope.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="referenced-bean-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "referenced-bean-class" element represents the
+ <xsd:documentation><![CDATA[
+
+ <p> The "referenced-bean-class" element represents the
fully qualified class name of the Java class
(either abstract or concrete) or Java interface
implemented by the corresponding referenced bean.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -3097,16 +3053,15 @@
<xsd:complexType name="faces-config-render-kitType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "render-kit" element represents a concrete RenderKit
+ <xsd:documentation><![CDATA[
+
+ <p> The "render-kit" element represents a concrete RenderKit
implementation that should be registered under the specified
render-kit-id. If no render-kit-id is specified, the
identifier of the default RenderKit
(RenderKitFactory.DEFAULT_RENDER_KIT) is assumed.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
@@ -3114,28 +3069,26 @@
type="javaee:string"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "render-kit-id" element represents an identifier
+ <xsd:documentation><![CDATA[
+
+ <p> The "render-kit-id" element represents an identifier
for the RenderKit represented by the parent
"render-kit" element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="render-kit-class"
type="javaee:fully-qualified-classType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "render-kit-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "render-kit-class" element represents the fully
qualified class name of a concrete RenderKit
implementation class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="renderer"
@@ -3160,9 +3113,9 @@
<xsd:complexType name="faces-config-client-behavior-rendererType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "client-behavior-renderer" element represents a concrete
+ <xsd:documentation><![CDATA[
+
+ <p> The "client-behavior-renderer" element represents a concrete
ClientBehaviorRenderer implementation class that should be
registered under the specified behavior renderer type identifier,
in the RenderKit associated with the parent "render-kit"
@@ -3172,34 +3125,31 @@
<p>Nested "attribute" elements identify generic component
attributes that are recognized by this renderer.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="client-behavior-renderer-type"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "client-behavior-renderer-type" element represents a renderer type
+ <xsd:documentation><![CDATA[
+
+ <p> The "client-behavior-renderer-type" element represents a renderer type
identifier for the Client Behavior Renderer represented by the parent
"client-behavior-renderer" element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="client-behavior-renderer-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "client-behavior-renderer-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "client-behavior-renderer-class" element represents the fully
qualified class name of a concrete Client Behavior Renderer
implementation class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -3212,9 +3162,9 @@
<xsd:complexType name="faces-config-rendererType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "renderer" element represents a concrete Renderer
+ <xsd:documentation><![CDATA[
+
+ <p> The "renderer" element represents a concrete Renderer
implementation class that should be registered under the
specified component family and renderer type identifiers,
in the RenderKit associated with the parent "render-kit"
@@ -3225,48 +3175,44 @@
<p>Nested "attribute" elements identify generic component
attributes that are recognized by this renderer.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="component-family"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "component-family" element represents the
+ <xsd:documentation><![CDATA[
+
+ <p> The "component-family" element represents the
component family for which the Renderer represented
by the parent "renderer" element will be used.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="renderer-type"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "renderer-type" element represents a renderer type
+ <xsd:documentation><![CDATA[
+
+ <p> The "renderer-type" element represents a renderer type
identifier for the Renderer represented by the parent
"renderer" element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="renderer-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "renderer-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "renderer-class" element represents the fully
qualified class name of a concrete Renderer
implementation class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="facet"
@@ -3291,13 +3237,12 @@
<xsd:complexType name="faces-config-renderer-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for renderer. It may contain implementation
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for renderer. It may contain implementation
specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -3314,13 +3259,12 @@
<xsd:complexType name="faces-config-render-kit-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for render-kit. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for render-kit. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -3337,15 +3281,14 @@
<xsd:complexType name="faces-config-suggested-valueType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "suggested-value" contains the value for the property or
+ <xsd:documentation><![CDATA[
+
+ <p> The "suggested-value" contains the value for the property or
attribute in which this element resides. This value is
advisory only and is intended for tools to use when
populating pallettes.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="javaee:string"/>
@@ -3357,17 +3300,16 @@
<xsd:complexType name="faces-config-supported-localeType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "supported-locale" element allows authors to declare
+ <xsd:documentation><![CDATA[
+
+ <p> The "supported-locale" element allows authors to declare
which locales are supported in this application instance.</p>
<p>It must be specified as :language:[_:country:[_:variant:]]
without the colons, for example "ja_JP_SJIS". The
separators between the segments may be '-' or '_'.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:extension base="javaee:faces-config-localeType">
@@ -3382,9 +3324,9 @@
<xsd:complexType name="faces-config-behaviorType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "behavior" element represents a concrete Behavior
+ <xsd:documentation><![CDATA[
+
+ <p> The "behavior" element represents a concrete Behavior
implementation class that should be registered under the
specified behavior identifier. Behavior identifiers must
be unique within the entire web application.</p>
@@ -3399,35 +3341,32 @@
more completely describe their components to tools and users.
These elements have no required runtime semantics.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="behavior-id"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "behavior-id" element represents the identifier
+ <xsd:documentation><![CDATA[
+
+ <p> The "behavior-id" element represents the identifier
under which the corresponding Behavior class should
be registered.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="behavior-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "behavior-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "behavior-class" element represents the fully
qualified class name of a concrete Behavior
implementation class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="attribute"
@@ -3435,17 +3374,16 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Nested "attribute" elements identify generic
+ <xsd:documentation><![CDATA[
+
+ <p> Nested "attribute" elements identify generic
attributes that may be configured on the
corresponding UIComponent in order to affect the
operation of the Behavior. This attribute is
primarily for design-time tools and is not
specified to have any meaning at runtime.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="property"
@@ -3453,17 +3391,16 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Nested "property" elements identify JavaBeans
+ <xsd:documentation><![CDATA[
+
+ <p> Nested "property" elements identify JavaBeans
properties of the Behavior implementation class
that may be configured to affect the operation of
the Behavior. This attribute is primarily for
design-time tools and is not specified to have
any meaning at runtime.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="behavior-extension"
@@ -3480,13 +3417,12 @@
<xsd:complexType name="faces-config-behavior-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for behavior. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for behavior. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -3503,9 +3439,9 @@
<xsd:complexType name="faces-config-validatorType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "validator" element represents a concrete Validator
+ <xsd:documentation><![CDATA[
+
+ <p> The "validator" element represents a concrete Validator
implementation class that should be registered under the
specified validator identifier. Validator identifiers must
be unique within the entire web application.</p>
@@ -3520,35 +3456,32 @@
more completely describe their components to tools and users.
These elements have no required runtime semantics.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="validator-id"
type="javaee:string">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "validator-id" element represents the identifier
+ <xsd:documentation><![CDATA[
+
+ <p> The "validator-id" element represents the identifier
under which the corresponding Validator class should
be registered.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="validator-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "validator-class" element represents the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "validator-class" element represents the fully
qualified class name of a concrete Validator
implementation class.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="attribute"
@@ -3556,17 +3489,16 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Nested "attribute" elements identify generic
+ <xsd:documentation><![CDATA[
+
+ <p> Nested "attribute" elements identify generic
attributes that may be configured on the
corresponding UIComponent in order to affect the
operation of the Validator. This attribute is
primarily for design-time tools and is not
specified to have any meaning at runtime.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="property"
@@ -3574,17 +3506,16 @@
minOccurs="0"
maxOccurs="unbounded">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Nested "property" elements identify JavaBeans
+ <xsd:documentation><![CDATA[
+
+ <p> Nested "property" elements identify JavaBeans
properties of the Validator implementation class
that may be configured to affect the operation of
the Validator. This attribute is primarily for
design-time tools and is not specified to have
any meaning at runtime.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="validator-extension"
@@ -3601,13 +3532,12 @@
<xsd:complexType name="faces-config-validator-extensionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> Extension element for validator. It may contain
+ <xsd:documentation><![CDATA[
+
+ <p> Extension element for validator. It may contain
implementation specific content.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:any minOccurs="0"
@@ -3621,17 +3551,16 @@
<xsd:simpleType name="faces-config-valueType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "value" element is the String representation of
+ <xsd:documentation><![CDATA[
+
+ <p> The "value" element is the String representation of
a literal value to which a scalar managed property
will be set, or a value binding expression ("#{...}")
that will be used to calculate the required value.
It will be converted as specified for the actual
property type.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:union memberTypes="javaee:faces-config-el-expressionType xsd:string"/>
</xsd:simpleType>
@@ -3641,16 +3570,15 @@
<xsd:complexType name="faces-config-value-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "value-class" element defines the Java type to which each
+ <xsd:documentation><![CDATA[
+
+ <p> The "value-class" element defines the Java type to which each
"value" element's value will be converted to, prior to adding
it to the "list-entries" list for a managed property that is
a java.util.List, or a "map-entries" map for a managed
property that is a java.util.Map.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="javaee:fully-qualified-classType">
@@ -3665,16 +3593,15 @@
<xsd:complexType name="faces-config-list-entriesType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "list-entries" element represents a set of initialization
+ <xsd:documentation><![CDATA[
+
+ <p> The "list-entries" element represents a set of initialization
elements for a managed property that is a java.util.List or an
array. In the former case, the "value-class" element can
optionally be used to declare the Java type to which each
value should be converted before adding it to the Collection.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="value-class"
@@ -3697,9 +3624,9 @@
<xsd:complexType name="faces-config-system-event-listenerType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The presence of this element within the "application" element in
+ <xsd:documentation><![CDATA[
+
+ <p> The presence of this element within the "application" element in
an application configuration resource file indicates the
developer wants to add an SystemEventListener to this
application instance. Elements nested within this element allow
@@ -3708,54 +3635,50 @@
can be the source of events that are delivered to the listener
instance.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element name="system-event-listener-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "system-event-listener-class" element contains
+ <xsd:documentation><![CDATA[
+
+ <p> The "system-event-listener-class" element contains
the fully qualified class name of the concrete
SystemEventListener implementation class that will be
called when events of the type specified by the
"system-event-class" are sent by the runtime.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="system-event-class"
type="javaee:fully-qualified-classType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "system-event-class" element contains the fully
+ <xsd:documentation><![CDATA[
+
+ <p> The "system-event-class" element contains the fully
qualified class name of the SystemEvent subclass for
which events will be delivered to the class whose fully
qualified class name is given by the
"system-event-listener-class" element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="source-class"
type="javaee:fully-qualified-classType"
minOccurs="0">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> The "source-class" element, if present, contains the
+ <xsd:documentation><![CDATA[
+
+ <p> The "source-class" element, if present, contains the
fully qualified class name of the class that will be the
source for the event to be delivered to the class whose
fully qualified class name is given by the
"system-event-listener-class" element.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
</xsd:element>
</xsd:sequence>
@@ -3765,13 +3688,12 @@
<xsd:simpleType name="faces-config-versionType">
<xsd:annotation>
- <xsd:documentation>
- <![CDATA[[
- <p> This type contains the recognized versions of
+ <xsd:documentation><![CDATA[
+
+ <p> This type contains the recognized versions of
faces-config supported.</p>
- ]]>
- </xsd:documentation>
+ ]]></xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
<xsd:enumeration value="2.2"/>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-fragment_3_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-fragment_3_1.xsd
index 0cefe4e..435ba58 100644
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-fragment_3_1.xsd
+++ b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-fragment_3_1.xsd
@@ -269,4 +269,72 @@
</xsd:keyref>
</xsd:element>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="web-fragmentType">
+ <xsd:choice minOccurs="0"
+ maxOccurs="unbounded">
+ <xsd:element name="name"
+ type="javaee:java-identifierType"/>
+ <xsd:group ref="javaee:web-commonType"/>
+ <xsd:element name="ordering"
+ type="javaee:orderingType"/>
+ </xsd:choice>
+ <xsd:attributeGroup ref="javaee:web-common-attributes"/>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="orderingType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Please see section 8.2.2 of the specification for details.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="after"
+ type="javaee:ordering-orderingType"
+ minOccurs="0"
+ maxOccurs="1"/>
+ <xsd:element name="before"
+ type="javaee:ordering-orderingType"
+ minOccurs="0"
+ maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="ordering-orderingType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ This element contains a sequence of "name" elements, each of
+ which
+ refers to an application configuration resource by the "name"
+ declared on its web.xml fragment. This element can also contain
+ a single "others" element which specifies that this document
+ comes
+ before or after other documents within the application.
+ See section 8.2.2 of the specification for details.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="name"
+ type="javaee:java-identifierType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="others"
+ type="javaee:ordering-othersType"
+ minOccurs="0"
+ maxOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
</xsd:schema>
