Skip to content

Commit

Permalink
Merge pull request #1900 from jakartaee/add_xsds_for_4.1
Browse files Browse the repository at this point in the history
add xsds for 4.1
  • Loading branch information
arjantijms committed Mar 4, 2024
2 parents e24772f + f6b16ff commit b943f20
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 8 deletions.
10 changes: 5 additions & 5 deletions spec/src/main/asciidoc/FacesMetadata.adoc
Expand Up @@ -2,7 +2,7 @@
[[a7037]]
== Jakarta Faces Metadata

The XML Schema Definition for Application Configuration Resource __web-facesconfig_4_0.xsd__
The XML Schema Definition for Application Configuration Resource __web-facesconfig_4_1.xsd__
is included in a web browser optimized format along with the Javadoc.
That is the canonical location of the schemas in the specification.

Expand Down Expand Up @@ -150,8 +150,8 @@ __faces-config.xml__.
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
version="4.0">
https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_1.xsd"
version="4.1">
<faces-config-extension>
<facelets-processing>
<file-extension>.jspx</file-extension>
Expand Down Expand Up @@ -188,12 +188,12 @@ processing mode of .view.xml files to be xml.
[[a7134]]
=== XML Schema Definition For Facelet Taglib

The XML Schema Definition for Facelet Taglib __web-facelettaglibrary_4_0.xsd__
The XML Schema Definition for Facelet Taglib __web-facelettaglibrary_4_1.xsd__
is included in a web browser optimized format along with the Javadoc.
That is the canonical location of the schemas in the specification.

=== XML Schema Definition For Partial Response

The XML Schema Definition for Partial Repsonse __web-partialresponse_4_0.xsd__
The XML Schema Definition for Partial Repsonse __web-partialresponse_4_1.xsd__
is included in a web browser optimized format along with the Javadoc.
That is the canonical location of the schemas in the specification.
20 changes: 17 additions & 3 deletions spec/src/main/asciidoc/UsingFacesInWebApplications.adoc
Expand Up @@ -929,10 +929,24 @@ _jakarta.faces.event.PreDestroyApplicationEvent_.
==== Application Configuration Resource Format

Application configuration resources
that are written to run on Jakarta Faces 4.0 must include the following schema
that are written to run on Jakarta Faces 4.1 must include the following schema
declaration and must conform to the schema shown in
<<a7037, Appendix A - Jakarta Faces Metadata>>

[source,xml]
----
<faces-config
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_1.xsd"
version="4.1">
----

Application configuration resources
that are written to run on Jakarta Faces 4.0 must include the following schema
declaration:

[source,xml]
----
<faces-config
Expand Down Expand Up @@ -1712,8 +1726,8 @@ __Renderer__s that know how to decode and encode such a component:
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
version="4.0">
https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_1.xsd"
version="4.1">
<!-- Define our custom component -->
<component>
Expand Down

0 comments on commit b943f20

Please sign in to comment.