Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated the XML Schemas for Jakarta EE 9 versions of the specification #8

Merged
merged 5 commits into from
Apr 28, 2020
Merged

Updated the XML Schemas for Jakarta EE 9 versions of the specification #8

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
614aa3d
Updated the XML Schemas for Jakarta EE 9 versions of the specification
ivannov Apr 16, 2020
b4a268a
Bump the version of permission to 9
ivannov Apr 17, 2020
0fe1051
Fixed tests, copyright year of some schemas and Connectors spec schem…
ivannov Apr 18, 2020
499a21d
Some more migrations to JEE 9:
ivannov Apr 19, 2020
c24b377
Distinguish between specification name and terminology in the schema …
ivannov Apr 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jakartaee9/build
24 changes: 12 additions & 12 deletions jakartaee9/src/connector_1_7.xsds → jakartaee9/src/connectors_2_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.7">
version="2.0">
ivargrimstad marked this conversation as resolved.
Show resolved Hide resolved

<xsd:annotation>
<xsd:documentation>
Expand All @@ -35,9 +35,9 @@
<xsd:documentation>
<![CDATA[

This is the XML Schema for the Connector 1.7 deployment
This is the XML Schema for the Jakarta Connectors 2.0 deployment
descriptor. The deployment descriptor must be named
"META-INF/ra.xml" in the connector's rar file. All Connector
"META-INF/ra.xml" in the connector's rar file. All Jakarta Connectors
deployment descriptors must indicate the connector resource
adapter schema by using the Jakarta EE namespace:

Expand All @@ -49,16 +49,16 @@
<connector 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/connector_1_7.xsd"
version="1.7">
https://jakarta.ee/xml/ns/jakartaee/connectors_2_0.xsd"
version="2.0">
...
</connector>

The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Jakarta EE
namespace with the following location:

https://jakarta.ee/xml/ns/jakartaee/connector_1_7.xsd
https://jakarta.ee/xml/ns/jakartaee/connectors_2_0.xsd

]]>
</xsd:documentation>
Expand Down Expand Up @@ -144,7 +144,7 @@
Bean Validation annotation or its XML validation
descriptor equivalent to indicate that a configuration
property is required to be specified by the deployer.
See the Connectors specification for more information.
See the Jakarta Connectors specification for more information.

</xsd:documentation>
</xsd:annotation>
Expand Down Expand Up @@ -266,7 +266,7 @@
</authentication-mechanism-type>

Any additional security mechanisms are outside the
scope of the Connector architecture specification.
scope of the Jakarta Connectors architecture specification.

]]>
</xsd:documentation>
Expand Down Expand Up @@ -416,7 +416,7 @@
The element config-property-ignore is used to specify
whether the configuration tools must ignore considering the
configuration property during auto-discovery of
Configuration properties. See the Connector specification for
Configuration properties. See the Jakarta Connectors specification for
more details. If unspecified, the container must not ignore
the configuration property during auto-discovery.
This element must be one of the following, "true" or "false".
Expand All @@ -435,7 +435,7 @@
The element config-property-supports-dynamic-updates is used to specify
whether the configuration property allows its value to be updated, by
application server's configuration tools, during the lifetime of
the JavaBean instance. See the Connector specification for
the JavaBean instance. See the Jakarta Connectors specification for
more details. If unspecified, the container must not dynamically
reconfigure the property.
This element must be one of the following, "true" or "false".
Expand All @@ -454,7 +454,7 @@
The element config-property-confidential is used to specify
whether the configuration property is confidential and
recommends application server's configuration tools to use special
visual aids for editing them. See the Connector specification for
visual aids for editing them. See the Jakarta Connectors specification for
more details. If unspecified, the container must not treat the
property as confidential.
This element must be one of the following, "true" or "false".
Expand Down Expand Up @@ -705,7 +705,7 @@

<xsd:attribute name="version"
type="jakartaee:dewey-versionType"
fixed="1.7"
fixed="2.0"
use="required">
<xsd:annotation>
<xsd:documentation>
Expand Down
12 changes: 6 additions & 6 deletions ...taee9/src/jakartaee_web_services_1_4.xsds → ...taee9/src/jakartaee_web_services_2_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.4">
version="2.0">

<xsd:annotation>
<xsd:documentation>
Expand Down Expand Up @@ -61,16 +61,16 @@
<webservices 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/jakartaee_web_services_1_4.xsd"
version="1.4">
https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd"
version="2.0">
...
</webservices>

The instance documents may indicate the published version of the
schema using the xsi:schemaLocation attribute for the Jakarta EE
namespace with the following location:

https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_1_4.xsd
https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd

]]>
</xsd:documentation>
Expand Down Expand Up @@ -511,12 +511,12 @@

<xsd:attribute name="version"
type="jakartaee:dewey-versionType"
fixed="1.4"
fixed="2.0"
use="required">
<xsd:annotation>
<xsd:documentation>

The required value for the version is 1.4.
The required value for the version is 2.0.

</xsd:documentation>
</xsd:annotation>
Expand Down
2 changes: 1 addition & 1 deletion ...rc/jakartaee_web_services_client_1_4.xsds → ...rc/jakartaee_web_services_client_2_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.4">
version="2.0">

<xsd:annotation>
<xsd:documentation>
Expand Down
2 changes: 1 addition & 1 deletion jakartaee9/src/permissions_7.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved.

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand Down
10 changes: 5 additions & 5 deletions jakartaee9/src/web-app_4_0.xsds → jakartaee9/src/web-app_5_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="4.0">
version="5.0">

<xsd:annotation>
<xsd:documentation>
Expand All @@ -35,7 +35,7 @@
<xsd:documentation>
<![CDATA[

This is the XML Schema for the Servlet 4.0 deployment descriptor.
This is the XML Schema for the Jakarta Servlet 5.0 deployment descriptor.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop Jakarta in this context

The deployment descriptor must be named "WEB-INF/web.xml" in the
web application's war file. All Servlet deployment descriptors
must indicate the web application schema by using the Jakarta EE
Expand All @@ -49,15 +49,15 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="..."
version="4.0">
version="5.0">
...
</web-app>

The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Jakarta EE
namespace with the following location:

https://jakarta.ee/xml/ns/jakartaee/web-app_4_0.xsd
https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd

]]>
</xsd:documentation>
Expand All @@ -71,7 +71,7 @@

<!-- **************************************************** -->

<xsd:include schemaLocation="web-common_4_0.xsd"/>
<xsd:include schemaLocation="web-common_5_0.xsd"/>

<!-- **************************************************** -->

Expand Down
10 changes: 5 additions & 5 deletions jakartaee9/src/web-common_4_0.xsds → jakartaee9/src/web-common_5_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="4.0">
version="5.0">

<xsd:annotation>
<xsd:documentation>
Expand All @@ -35,7 +35,7 @@
<xsd:documentation>
<![CDATA[

This is the common XML Schema for the Servlet 4.0 deployment descriptor.
This is the common XML Schema for the Jakarta Servlet 5.0 deployment descriptor.
This file is in turn used by web.xml and web-fragment.xml
web application's war file. All Servlet deployment descriptors
must indicate the web common schema by using the Jakarta EE
Expand All @@ -49,15 +49,15 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="..."
version="4.0">
version="5.0">
...
</web-app>

The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Jakarta EE
namespace with the following location:

https://jakarta.ee/xml/ns/jakartaee/web-common_4_0.xsd
https://jakarta.ee/xml/ns/jakartaee/web-common_5_0.xsd

]]>
</xsd:documentation>
Expand Down Expand Up @@ -1199,7 +1199,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
<xsd:enumeration value="4.0"/>
<xsd:enumeration value="5.0"/>
</xsd:restriction>
</xsd:simpleType>

Expand Down
16 changes: 8 additions & 8 deletions ...rtaee9/src/web-facelettaglibrary_2_3.xsds → ...rtaee9/src/web-facelettaglibrary_3_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
ivargrimstad marked this conversation as resolved.
Show resolved Hide resolved

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -23,7 +23,7 @@
xmlns:xml="http://www.w3.org/XML/1998/namespace"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="2.3">
version="3.0">
<xsd:include schemaLocation="jakartaee_9.xsd"/>

<xsd:annotation>
Expand All @@ -35,17 +35,17 @@
<xsd:annotation>
<xsd:documentation>
<![CDATA[[
<p>The XML Schema for the Tag Libraries in the JavaServer Faces
<p>The XML Schema for the Tag Libraries in the Jakarta Server Faces
Standard Facelets View Declaration Language (Facelets VDL)
(Version 2.3).</p>
(Version 3.0).</p>

<p>JSF 2.3 Facelet Tag Libraries that wish to conform to this
<p>JSF 3.0 Facelet Tag Libraries that wish to conform to this
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSF to Jakarta Server Faces

schema must declare it in the following manner.</p>

&lt;facelet-taglib 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-facelettaglibary_2_3.xsd"
version="2.3"&gt;
version="3.0"&gt;

...

Expand Down Expand Up @@ -460,7 +460,7 @@

<div class="changed_added_2_2 changed_deleted_2_3">

<p>As of 2.3 of the specification, this requirement is no longer
<p>As of 3.0 of the specification, this requirement is no longer
present: This element must have exactly one of
<code>&lt;component-type&gt;</code>, <code>&lt;resource-id&gt;</code>,
or <code>&lt;handler-class&gt;</code> among its child elements.</p>
Expand Down Expand Up @@ -643,7 +643,7 @@ or <code>&lt;handler-class&gt;</code> among its child elements.</p>
</p>]]></xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
<xsd:enumeration value="2.3"/>
<xsd:enumeration value="3.0"/>
</xsd:restriction>
</xsd:simpleType>

Expand Down
12 changes: 6 additions & 6 deletions jakartaee9/src/web-facesconfig_2_3.xsds → jakartaee9/src/web-facesconfig_3_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--

Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
ivargrimstad marked this conversation as resolved.
Show resolved Hide resolved

This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
Expand All @@ -21,7 +21,7 @@
attributeFormDefault="unqualified"
elementFormDefault="qualified"
targetNamespace="https://jakarta.ee/xml/ns/jakartaee"
version="2.3"
version="3.0"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:include schemaLocation="jakartaee_9.xsd" />

Expand All @@ -35,8 +35,8 @@
<xsd:documentation>
<![CDATA[

<p>The XML Schema for the JavaServer Faces Application
Configuration File (Version 2.3).</p>
<p>The XML Schema for the Jakarta Server Faces Application
Configuration File (Version 3.0).</p>

<p>All JavaServer Faces configuration files must indicate
the JavaServer Faces schema by indicating the JavaServer
Expand All @@ -58,7 +58,7 @@
version of the schema using xsi:schemaLocation attribute
for jakartaee namespace with the following location:</p>

<p>https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_2_3.xsd</p>
<p>https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd</p>

]]>
</xsd:documentation>
Expand Down Expand Up @@ -3746,7 +3746,7 @@ which must contain exactly one <code>&lt;flow-id&gt;</code> element.</p>
]]></xsd:documentation>
</xsd:annotation>
<xsd:restriction base="xsd:token">
<xsd:enumeration value="2.3"/>
<xsd:enumeration value="3.0"/>
</xsd:restriction>
</xsd:simpleType>

Expand Down
10 changes: 5 additions & 5 deletions jakartaee9/src/web-fragment_4_0.xsds → jakartaee9/src/web-fragment_5_0.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="4.0">
version="5.0">

<xsd:annotation>
<xsd:documentation>
Expand All @@ -35,7 +35,7 @@
<xsd:documentation>
<![CDATA[

This is the XML Schema for the Servlet 4.0 deployment descriptor.
This is the XML Schema for the Jakarta Servlet 5.0 deployment descriptor.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop Jakarta in this context

The deployment descriptor must be named "META-INF/web-fragment.xml"
in the web fragment's jar file. All Servlet deployment descriptors
must indicate the web application schema by using the Jakarta EE
Expand All @@ -49,15 +49,15 @@
<web-fragment xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="..."
version="4.0">
version="5.0">
...
</web-fragment>

The instance documents may indicate the published version of
the schema using the xsi:schemaLocation attribute for Jakarta EE
namespace with the following location:

https://jakarta.ee/xml/ns/jakartaee/web-fragment_4_0.xsd
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd

]]>
</xsd:documentation>
Expand All @@ -71,7 +71,7 @@

<!-- **************************************************** -->

<xsd:include schemaLocation="web-common_4_0.xsd"/>
<xsd:include schemaLocation="web-common_5_0.xsd"/>

<!-- **************************************************** -->

Expand Down
Loading