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 all commits
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
14 changes: 7 additions & 7 deletions jakartaee9/src/application-client_9.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@

The application-client element is the root element of an
application client deployment descriptor. The application
client deployment descriptor describes the EJB components
and external resources referenced by the application
client.
client deployment descriptor describes the enterprise bean
components and external resources referenced by the
application client.

</xsd:documentation>
</xsd:annotation>
Expand All @@ -109,9 +109,9 @@
<xsd:annotation>
<xsd:documentation>

The ejb-ref-name element contains the name of an EJB
reference. The EJB reference is an entry in the application
client's environment and is relative to the
The ejb-ref-name element contains the name of an enterprise bean
reference. The enterprise bean reference is an entry
in the application client's environment and is relative to the
java:comp/env context. The name must be unique within the
application client.

Expand Down Expand Up @@ -213,7 +213,7 @@
The callback-handler element names a class provided by
the application. The class must have a no args
constructor and must implement the
javax.security.auth.callback.CallbackHandler
jakarta.security.auth.callback.CallbackHandler
interface. The class will be instantiated by the
application client container and used by the container
to collect authentication information from the user.
Expand Down
52 changes: 26 additions & 26 deletions jakartaee9/src/connector_1_7.xsds → jakartaee9/src/connector_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">

<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 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 connector
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/connector_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/connector_2_0.xsd

]]>
</xsd:documentation>
Expand Down Expand Up @@ -119,7 +119,7 @@
The element activationspec-class specifies the fully
qualified Java class name of the activation
specification class. This class must implement the
javax.resource.spi.ActivationSpec interface. The
jakarta.resource.spi.ActivationSpec interface. The
implementation of this class is required to be a
JavaBean.

Expand All @@ -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 @@ -187,7 +187,7 @@
interface implemented by an administered object.

Example:
<adminobject-interface>javax.jms.Destination
<adminobject-interface>jakarta.jms.Destination
</adminobject-interface>

]]>
Expand Down Expand Up @@ -235,10 +235,10 @@
security contract and authentication mechanism.

Note that BasicPassword mechanism type should support the
javax.resource.spi.security.PasswordCredential interface.
jakarta.resource.spi.security.PasswordCredential interface.
The Kerbv5 mechanism type should support the
org.ietf.jgss.GSSCredential interface or the deprecated
javax.resource.spi.security.GenericCredential interface.
jakarta.resource.spi.security.GenericCredential interface.

</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.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
scope of the Jakarta Connectors architecture specification.
scope of the Jakarta Connectors specification.

Architecture was dropped from the spec name. Jakarta Connectors specification should be fine.


]]>
</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 @@ -494,7 +494,7 @@
The element managedconnectionfactory-class specifies
the fully qualified name of the Java class that
implements the
javax.resource.spi.ManagedConnectionFactory interface.
jakarta.resource.spi.ManagedConnectionFactory interface.
This Java class is provided as part of resource
adapter's implementation of connector architecture
specified contracts. The implementation of this
Expand Down Expand Up @@ -529,7 +529,7 @@

OR

<connectionfactory-interface>javax.resource.cci.ConnectionFactory
<connectionfactory-interface>jakarta.resource.cci.ConnectionFactory
</connectionfactory-interface>

]]>
Expand Down Expand Up @@ -569,7 +569,7 @@

Example:

<connection-interface>javax.resource.cci.Connection
<connection-interface>jakarta.resource.cci.Connection
</connection-interface>

]]>
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 Expand Up @@ -764,20 +764,20 @@

The possible values are:

javax.resource.spi.security.PasswordCredential
jakarta.resource.spi.security.PasswordCredential
org.ietf.jgss.GSSCredential
javax.resource.spi.security.GenericCredential
jakarta.resource.spi.security.GenericCredential

</xsd:documentation>
</xsd:annotation>
<xsd:simpleContent>
<xsd:restriction base="jakartaee:fully-qualified-classType">
<xsd:enumeration
value="javax.resource.spi.security.PasswordCredential"/>
value="jakarta.resource.spi.security.PasswordCredential"/>
<xsd:enumeration
value="org.ietf.jgss.GSSCredential"/>
<xsd:enumeration
value="javax.resource.spi.security.GenericCredential"/>
value="jakarta.resource.spi.security.GenericCredential"/>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
Expand Down Expand Up @@ -907,7 +907,7 @@

Example:

<messagelistener-type>javax.jms.MessageListener
<messagelistener-type>jakarta.jms.MessageListener
</messagelistener-type>

]]>
Expand Down Expand Up @@ -950,7 +950,7 @@
If there is no transaction-support specified as part of this element
or metadata annotation, then the application server must consider that
the resource adapter does not support either the resource manager local
or JTA transactions and must consider the transaction support as
or Jakarta Transactions transactions and must consider the transaction support as
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
or Jakarta Transactions transactions and must consider the transaction support as
or Jakarta transactions and must consider the transaction support as

I will let others comment on this.

NoTransaction. Note that resource adapters may specify the level of
transaction support to be used at runtime for a ManagedConnectionFactory
through the TransactionSupport interface.
Expand Down Expand Up @@ -1056,7 +1056,7 @@

The element resourceadapter-class specifies the
fully qualified name of a Java class that implements
the javax.resource.spi.ResourceAdapter
the jakarta.resource.spi.ResourceAdapter
interface. This Java class is provided as part of
resource adapter's implementation of connector
architecture specified contracts. The implementation
Expand Down
Loading