-
Notifications
You must be signed in to change notification settings - Fork 20
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.
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
Updated the XML Schemas for Jakarta EE 9 versions of the specification #8
Conversation
Signed-off-by: Ivan St. Ivanov <ivan.st.ivanov@gmail.com>
ec7ee07
to
614aa3d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The permissions_7.xsds version needs to be bumped since the namespace is changed. This file has not changed since Java EE 7. My suggestion would be to bump it to 9 to match the current release.
Signed-off-by: Ivan St. Ivanov <ivan.st.ivanov@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are a lot of test errors, can you check by running
ant clean build test
I have the fix in my repository
3f83473
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the tests are failing that means they need to be updated as well.
@@ -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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You know what I'm going to say, right? :-)
Please check all files to make sure the first copyright date has not been lost.
…a name Signed-off-by: Ivan St. Ivanov <ivan.st.ivanov@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are few more places you would need to replace JSF, JAX-WS, JAX-RPC, JMS and JTA
Namespace references need to change from javax to jakarta. I do not see any test to validate such a change.
Any reference to specification section numbers should match with current document.
jakartaee9/src/connector_2_0.xsds
Outdated
... | ||
</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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://jakarta.ee/xml/ns/jakartaee/connectors_2_0.xsd | |
https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd |
jakartaee9/src/connector_2_0.xsds
Outdated
@@ -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" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://jakarta.ee/xml/ns/jakartaee/connectors_2_0.xsd" | |
https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd" |
|
||
<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 |
There was a problem hiding this comment.
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
@hussainnm thanks for your reviews and the help! I just didn't understand this:
Which namespaces do you mean? I see some javax packages in the documentation mainly |
Yes, I meant the ones in documentation and CDATA. In the above example, it mentions the permitted values are javax.jms.ConnectionFactory. This should be changed to jakarta.jms.ConnectionFactory. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have flagged few places where rework is required. The full spec name with Jakarta is needed only if it is directly referring to a spec. In most cases the short name of the spec will do.
Revert the changes made to ejb-jar_4_0.xsds. This file is already reviewed and approved.
JAX-WS is Jakarta XML Web Services, Jakarta Enterprise Web Services is new name for Web Services for Java EE.
@arjantijms can you please review the JSF changes.
Someone needs to review the Connectors changes as well.
client deployment descriptor describes the EJB components | ||
and external resources referenced by the application | ||
client. | ||
client deployment descriptor describes the Jakarta Enterprise |
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
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 Jakarta Enterprise |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change this to enterprise bean reference
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 Jakarta Enterprise | ||
Beans reference. The Jakarta Enterprise Beans reference is an entry |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change this to enterprise bean reference
jakartaee9/src/connector_2_0.xsds
Outdated
@@ -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 |
There was a problem hiding this comment.
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.
jakartaee9/src/connector_2_0.xsds
Outdated
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 |
There was a problem hiding this comment.
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.
"All Connector deployment descriptors" sounds right than "All Connectors deployment descriptors".
I will let others comment on this.
jakartaee9/src/web-app_5_0.xsds
Outdated
java:comp/env context. The name must be unique within | ||
the web application. | ||
The ejb-ref-name element contains the name of an Jakarta | ||
Enterprise Beans reference. The Jakarta Enterprise Beans |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Enterprise Beans reference. The Jakarta Enterprise Beans | |
enterprise bean reference. The enterprise bean |
|
||
<p>JSF 2.3 Facelet Tag Libraries that wish to conform to this | ||
schema must declare it in the following manner.</p> | ||
<p>Jakarta Server faces 3.0 Facelet Tag Libraries that wish to conform to |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<p>Jakarta Server faces 3.0 Facelet Tag Libraries that wish to conform to | |
<p>Jakarta Server Faces 3.0 Facelet Tag Libraries that wish to conform to |
In this file references to JSF could be shortened to just Faces instead of Jakarta Server Faces. e.g., Faces Behavior, Faces UIComponent, Faces Converter, Faces Validator.
I will let others comment on this. (@arjantijms)
jakartaee9/src/web-fragment_5_0.xsds
Outdated
@@ -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. |
There was a problem hiding this comment.
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
* New specification names in schema docs * Updated namespaces from javax to jakarta Signed-off-by: Ivan St. Ivanov <ivan.st.ivanov@gmail.com>
…documentation Signed-off-by: Ivan St. Ivanov <ivan.st.ivanov@gmail.com>
a6437ef
to
c24b377
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All changes look good.
Only two open comments in connector_2_0.xsd which others need to comment on:
https://github.com/eclipse-ee4j/jakartaee-schemas/blob/c24b377c0755f13d2e0fecad8060cf73777b5d2a/jakartaee9/src/connector_2_0.xsds#L269
Architecture was dropped from the spec name. Jakarta Connectors specification should be fine.
https://github.com/eclipse-ee4j/jakartaee-schemas/blob/c24b377c0755f13d2e0fecad8060cf73777b5d2a/jakartaee9/src/connector_2_0.xsds#L953
Jakarta Transactions transactions
Signed-off-by: Ivan St. Ivanov ivan.st.ivanov@gmail.com