From 614aa3d407c7e4a496b6df06b05422814b2d75d1 Mon Sep 17 00:00:00 2001 From: "Ivan St. Ivanov" Date: Thu, 16 Apr 2020 22:30:08 +0300 Subject: [PATCH 1/5] Updated the XML Schemas for Jakarta EE 9 versions of the specification Signed-off-by: Ivan St. Ivanov --- .gitignore | 1 + ...connector_1_7.xsds => connectors_2_0.xsds} | 24 +++++++++---------- ...4.xsds => jakartaee_web_services_2_0.xsds} | 12 +++++----- ...=> jakartaee_web_services_client_2_0.xsds} | 2 +- jakartaee9/src/permissions_7.xsds | 2 +- .../{web-app_4_0.xsds => web-app_5_0.xsds} | 10 ++++---- ...eb-common_4_0.xsds => web-common_5_0.xsds} | 10 ++++---- ..._3.xsds => web-facelettaglibrary_3_0.xsds} | 16 ++++++------- ...nfig_2_3.xsds => web-facesconfig_3_0.xsds} | 12 +++++----- ...ragment_4_0.xsds => web-fragment_5_0.xsds} | 10 ++++---- ..._2_3.xsds => web-partialresponse_3_0.xsds} | 6 ++--- 11 files changed, 53 insertions(+), 52 deletions(-) create mode 100644 .gitignore rename jakartaee9/src/{connector_1_7.xsds => connectors_2_0.xsds} (98%) rename jakartaee9/src/{jakartaee_web_services_1_4.xsds => jakartaee_web_services_2_0.xsds} (98%) rename jakartaee9/src/{jakartaee_web_services_client_1_4.xsds => jakartaee_web_services_client_2_0.xsds} (99%) rename jakartaee9/src/{web-app_4_0.xsds => web-app_5_0.xsds} (97%) rename jakartaee9/src/{web-common_4_0.xsds => web-common_5_0.xsds} (99%) rename jakartaee9/src/{web-facelettaglibrary_2_3.xsds => web-facelettaglibrary_3_0.xsds} (98%) rename jakartaee9/src/{web-facesconfig_2_3.xsds => web-facesconfig_3_0.xsds} (99%) rename jakartaee9/src/{web-fragment_4_0.xsds => web-fragment_5_0.xsds} (97%) rename jakartaee9/src/{web-partialresponse_2_3.xsds => web-partialresponse_3_0.xsds} (98%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f21fd13 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +jakartaee9/build \ No newline at end of file diff --git a/jakartaee9/src/connector_1_7.xsds b/jakartaee9/src/connectors_2_0.xsds similarity index 98% rename from jakartaee9/src/connector_1_7.xsds rename to jakartaee9/src/connectors_2_0.xsds index e48a0df..66fdaed 100644 --- a/jakartaee9/src/connector_1_7.xsds +++ b/jakartaee9/src/connectors_2_0.xsds @@ -23,7 +23,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.7"> + version="2.0"> @@ -35,9 +35,9 @@ + https://jakarta.ee/xml/ns/jakartaee/connectors_2_0.xsd" + version="2.0"> ... @@ -58,7 +58,7 @@ 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 ]]> @@ -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. @@ -266,7 +266,7 @@ Any additional security mechanisms are outside the - scope of the Connector architecture specification. + scope of the Jakarta Connectors architecture specification. ]]> @@ -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". @@ -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". @@ -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". @@ -705,7 +705,7 @@ diff --git a/jakartaee9/src/jakartaee_web_services_1_4.xsds b/jakartaee9/src/jakartaee_web_services_2_0.xsds similarity index 98% rename from jakartaee9/src/jakartaee_web_services_1_4.xsds rename to jakartaee9/src/jakartaee_web_services_2_0.xsds index 2ec2e3a..b449e45 100644 --- a/jakartaee9/src/jakartaee_web_services_1_4.xsds +++ b/jakartaee9/src/jakartaee_web_services_2_0.xsds @@ -23,7 +23,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.4"> + version="2.0"> @@ -61,8 +61,8 @@ + https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd" + version="2.0"> ... @@ -70,7 +70,7 @@ 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 ]]> @@ -511,12 +511,12 @@ - The required value for the version is 1.4. + The required value for the version is 2.0. diff --git a/jakartaee9/src/jakartaee_web_services_client_1_4.xsds b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds similarity index 99% rename from jakartaee9/src/jakartaee_web_services_client_1_4.xsds rename to jakartaee9/src/jakartaee_web_services_client_2_0.xsds index 4f4b30d..1a0972b 100644 --- a/jakartaee9/src/jakartaee_web_services_client_1_4.xsds +++ b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds @@ -23,7 +23,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" - version="1.4"> + version="2.0"> diff --git a/jakartaee9/src/permissions_7.xsds b/jakartaee9/src/permissions_7.xsds index 8b4b43d..192bddf 100644 --- a/jakartaee9/src/permissions_7.xsds +++ b/jakartaee9/src/permissions_7.xsds @@ -1,7 +1,7 @@ - + diff --git a/jakartaee9/src/web-common_4_0.xsds b/jakartaee9/src/web-common_5_0.xsds similarity index 99% rename from jakartaee9/src/web-common_4_0.xsds rename to jakartaee9/src/web-common_5_0.xsds index 2fbf958..42f8122 100644 --- a/jakartaee9/src/web-common_4_0.xsds +++ b/jakartaee9/src/web-common_5_0.xsds @@ -23,7 +23,7 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" - version="4.0"> + version="5.0"> @@ -35,7 +35,7 @@ + version="5.0"> ... @@ -57,7 +57,7 @@ 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 ]]> @@ -1199,7 +1199,7 @@ - + diff --git a/jakartaee9/src/web-facelettaglibrary_2_3.xsds b/jakartaee9/src/web-facelettaglibrary_3_0.xsds similarity index 98% rename from jakartaee9/src/web-facelettaglibrary_2_3.xsds rename to jakartaee9/src/web-facelettaglibrary_3_0.xsds index 5ac3b1f..b3c2bb0 100644 --- a/jakartaee9/src/web-facelettaglibrary_2_3.xsds +++ b/jakartaee9/src/web-facelettaglibrary_3_0.xsds @@ -1,7 +1,7 @@ - + diff --git a/jakartaee9/src/web-partialresponse_2_3.xsds b/jakartaee9/src/web-partialresponse_3_0.xsds similarity index 98% rename from jakartaee9/src/web-partialresponse_2_3.xsds rename to jakartaee9/src/web-partialresponse_3_0.xsds index 6bd821f..ac382da 100644 --- a/jakartaee9/src/web-partialresponse_2_3.xsds +++ b/jakartaee9/src/web-partialresponse_3_0.xsds @@ -1,7 +1,7 @@ diff --git a/jakartaee9/src/web-facelettaglibrary_3_0.xsds b/jakartaee9/src/web-facelettaglibrary_3_0.xsds index b3c2bb0..5fbfe0e 100644 --- a/jakartaee9/src/web-facelettaglibrary_3_0.xsds +++ b/jakartaee9/src/web-facelettaglibrary_3_0.xsds @@ -1,7 +1,7 @@ com.wombat.MyOtherCustomWorkContext - + diff --git a/jakartaee9/test/connector.xml b/jakartaee9/test/connector.xml index 1bfe80b..b0ec1ef 100644 --- a/jakartaee9/test/connector.xml +++ b/jakartaee9/test/connector.xml @@ -21,8 +21,8 @@ + connector_2_0.xsd" + version="2.0" metadata-complete="true"> Simple Resource Adapter Java Software @@ -178,7 +178,7 @@ com.wombat.MyOtherCustomWorkContext - + diff --git a/jakartaee9/test/permissions-empty.xml b/jakartaee9/test/permissions-empty.xml index d70c315..ccaaaa3 100644 --- a/jakartaee9/test/permissions-empty.xml +++ b/jakartaee9/test/permissions-empty.xml @@ -21,11 +21,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xml="http://www.w3.org/XML/1998/namespace" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee - permissions_7.xsd" - version="7"> + permissions_9.xsd" + version="9"> - + diff --git a/jakartaee9/test/permissions.xml b/jakartaee9/test/permissions.xml index f84fcb8..732c5c2 100644 --- a/jakartaee9/test/permissions.xml +++ b/jakartaee9/test/permissions.xml @@ -21,8 +21,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xml="http://www.w3.org/XML/1998/namespace" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee - permissions_7.xsd" - version="7"> + permissions_9.xsd" + version="9"> java.io.FilePermission @@ -93,5 +93,5 @@ - + diff --git a/jakartaee9/test/web-app-complete.xml b/jakartaee9/test/web-app-complete.xml index 4f7f3a2..613107f 100644 --- a/jakartaee9/test/web-app-complete.xml +++ b/jakartaee9/test/web-app-complete.xml @@ -20,9 +20,9 @@ + version="5.0"> /myappcomplete UTF-8 UTF-8 @@ -173,4 +173,4 @@ B - + diff --git a/jakartaee9/test/web-app-data-source.xml b/jakartaee9/test/web-app-data-source.xml index 2ba344c..d03b1f4 100644 --- a/jakartaee9/test/web-app-data-source.xml +++ b/jakartaee9/test/web-app-data-source.xml @@ -20,8 +20,8 @@ + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd" + version="5.0"> MyInventoryServlet com.acme.Inventory @@ -208,4 +208,4 @@ 50 - + diff --git a/jakartaee9/test/web-app-resources.xml b/jakartaee9/test/web-app-resources.xml index b079a25..bfe3353 100644 --- a/jakartaee9/test/web-app-resources.xml +++ b/jakartaee9/test/web-app-resources.xml @@ -20,8 +20,8 @@ + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd" + version="5.0"> MyInventoryServlet com.acme.Inventory @@ -269,4 +269,4 @@ - + diff --git a/jakartaee9/test/web-app.xml b/jakartaee9/test/web-app.xml index 41b054c..8c636bf 100644 --- a/jakartaee9/test/web-app.xml +++ b/jakartaee9/test/web-app.xml @@ -20,8 +20,8 @@ + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-app_5_0.xsd http://foobar.com http://foobar.com/foobar.xsd" + version="5.0"> /myapp UTF-8 UTF-8 @@ -165,4 +165,4 @@ - + diff --git a/jakartaee9/test/web-facelettaglibrary-composite.xml b/jakartaee9/test/web-facelettaglibrary-composite.xml index 27fa143..77a0d67 100644 --- a/jakartaee9/test/web-facelettaglibrary-composite.xml +++ b/jakartaee9/test/web-facelettaglibrary-composite.xml @@ -20,12 +20,12 @@ http://domain.com/path compositeTest - + diff --git a/jakartaee9/test/web-facelettaglibrary-library-class.xml b/jakartaee9/test/web-facelettaglibrary-library-class.xml index 40d8c9f..080b1c4 100644 --- a/jakartaee9/test/web-facelettaglibrary-library-class.xml +++ b/jakartaee9/test/web-facelettaglibrary-library-class.xml @@ -20,9 +20,9 @@ com.foo.MyLibrary - + diff --git a/jakartaee9/test/web-facelettaglibrary-pathological-0.xml b/jakartaee9/test/web-facelettaglibrary-pathological-0.xml index 272faa8..7a6e40f 100644 --- a/jakartaee9/test/web-facelettaglibrary-pathological-0.xml +++ b/jakartaee9/test/web-facelettaglibrary-pathological-0.xml @@ -20,8 +20,8 @@ com.foo.MyLibrary http://mojarra.dev.java.net/mojarra_ext @@ -34,5 +34,5 @@ compositeTest - + diff --git a/jakartaee9/test/web-facelettaglibrary-pathological-1.xml b/jakartaee9/test/web-facelettaglibrary-pathological-1.xml index f2f0e60..203a662 100644 --- a/jakartaee9/test/web-facelettaglibrary-pathological-1.xml +++ b/jakartaee9/test/web-facelettaglibrary-pathological-1.xml @@ -20,8 +20,8 @@ http://mojarra.dev.java.net/mojarra_ext @@ -29,5 +29,5 @@ - + diff --git a/jakartaee9/test/web-facelettaglibrary-standard.xml b/jakartaee9/test/web-facelettaglibrary-standard.xml index 54822f4..31056af 100644 --- a/jakartaee9/test/web-facelettaglibrary-standard.xml +++ b/jakartaee9/test/web-facelettaglibrary-standard.xml @@ -20,8 +20,8 @@ http://mojarra.dev.java.net/mojarra_ext @@ -54,4 +54,4 @@ --> - + diff --git a/jakartaee9/test/web-facesconfig-pathological-0.xml b/jakartaee9/test/web-facesconfig-pathological-0.xml index afe45ba..be10179 100644 --- a/jakartaee9/test/web-facesconfig-pathological-0.xml +++ b/jakartaee9/test/web-facesconfig-pathological-0.xml @@ -19,8 +19,8 @@ + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_3_0.xsd" + version="3.0"> []][ @@ -28,7 +28,7 @@ - + diff --git a/jakartaee9/test/web-facesconfig-standard.xml b/jakartaee9/test/web-facesconfig-standard.xml index 7a4435d..c1a1b81 100644 --- a/jakartaee9/test/web-facesconfig-standard.xml +++ b/jakartaee9/test/web-facesconfig-standard.xml @@ -19,8 +19,8 @@ + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-facesconfig_3_0.xsd" + version="3.0"> com.sun.faces.CustomMessages @@ -774,4 +774,4 @@ - + diff --git a/jakartaee9/test/web-fragment-complete.xml b/jakartaee9/test/web-fragment-complete.xml index df10624..28f839f 100644 --- a/jakartaee9/test/web-fragment-complete.xml +++ b/jakartaee9/test/web-fragment-complete.xml @@ -20,9 +20,9 @@ + version="5.0"> A MyInventoryServlet @@ -170,4 +170,4 @@ - + diff --git a/jakartaee9/test/web-partialresponse-standard.xml b/jakartaee9/test/web-partialresponse-standard.xml index 1eb10db..95dd0aa 100644 --- a/jakartaee9/test/web-partialresponse-standard.xml +++ b/jakartaee9/test/web-partialresponse-standard.xml @@ -19,7 +19,7 @@ + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee web-partialresponse_3_0.xsd" id="partial"> @@ -50,4 +50,4 @@ - + diff --git a/jakartaee9/test/web-service-features.xml b/jakartaee9/test/web-service-features.xml index 0b9272a..a339031 100644 --- a/jakartaee9/test/web-service-features.xml +++ b/jakartaee9/test/web-service-features.xml @@ -20,8 +20,8 @@ + jakartaee_web_services_2_0.xsd" + version="2.0"> JoesServices META-INF/joe.wsdl @@ -44,4 +44,4 @@ - + diff --git a/jakartaee9/test/web-service-handler.xml b/jakartaee9/test/web-service-handler.xml index 7c847c7..5fa60f2 100644 --- a/jakartaee9/test/web-service-handler.xml +++ b/jakartaee9/test/web-service-handler.xml @@ -23,8 +23,8 @@ xmlns:soap2="http://HandlerInfo.org/Server2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee - jakartaee_web_services_1_4.xsd" - version="1.4"> + jakartaee_web_services_2_0.xsd" + version="2.0"> HandlerInfoTest WEB-INF/wsdl/HelloService.wsdl @@ -53,4 +53,4 @@ - + From 499a21db92fa86d26fd4c747df350570b7410d53 Mon Sep 17 00:00:00 2001 From: "Ivan St. Ivanov" Date: Sun, 19 Apr 2020 18:38:47 +0300 Subject: [PATCH 4/5] Some more migrations to JEE 9: * New specification names in schema docs * Updated namespaces from javax to jakarta Signed-off-by: Ivan St. Ivanov --- jakartaee9/src/application-client_9.xsds | 14 ++-- jakartaee9/src/connector_2_0.xsds | 32 ++++----- jakartaee9/src/ejb-jar_4_0.xsds | 22 +++--- jakartaee9/src/jakartaee_9.xsds | 61 ++++++++--------- .../src/jakartaee_web_services_2_0.xsds | 57 ++++++++-------- .../jakartaee_web_services_client_2_0.xsds | 67 ++++++++++--------- jakartaee9/src/web-app_5_0.xsds | 15 +++-- jakartaee9/src/web-facelettaglibrary_3_0.xsds | 12 ++-- jakartaee9/src/web-facesconfig_3_0.xsds | 23 ++++--- jakartaee9/src/web-fragment_5_0.xsds | 16 ++--- jakartaee9/test/app-client-complete.xml | 4 +- jakartaee9/test/app-client-data-source.xml | 4 +- jakartaee9/test/app-client-handler.xml | 2 +- jakartaee9/test/app-client-injection.xml | 4 +- jakartaee9/test/app-client-mapped-name.xml | 4 +- jakartaee9/test/app-client-module.xml | 8 +-- jakartaee9/test/app-client-resources.xml | 8 +-- jakartaee9/test/app-client.xml | 8 +-- jakartaee9/test/application-resources.xml | 8 +-- jakartaee9/test/connector-complete.xml | 2 +- jakartaee9/test/connector.xml | 2 +- jakartaee9/test/ejb-jar-complete.xml | 4 +- .../ejb-jar-persistence-no-lookup-name.xml | 10 +-- jakartaee9/test/ejb-jar.xml | 32 ++++----- jakartaee9/test/web-app-resources.xml | 4 +- .../web-facelettaglibrary-pathological-0.xml | 2 +- .../test/web-facelettaglibrary-standard.xml | 2 +- jakartaee9/test/web-facesconfig-standard.xml | 14 ++-- 28 files changed, 224 insertions(+), 217 deletions(-) diff --git a/jakartaee9/src/application-client_9.xsds b/jakartaee9/src/application-client_9.xsds index b850f0e..dfb606c 100644 --- a/jakartaee9/src/application-client_9.xsds +++ b/jakartaee9/src/application-client_9.xsds @@ -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 Jakarta Enterprise + Beans components and external resources referenced by the + application client. @@ -109,9 +109,9 @@ - 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 + Beans reference. The Jakarta Enterprise Beans 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. @@ -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. diff --git a/jakartaee9/src/connector_2_0.xsds b/jakartaee9/src/connector_2_0.xsds index 66fdaed..4040d66 100644 --- a/jakartaee9/src/connector_2_0.xsds +++ b/jakartaee9/src/connector_2_0.xsds @@ -49,7 +49,7 @@ ... @@ -58,7 +58,7 @@ the schema using the xsi:schemaLocation attribute for Jakarta EE namespace with the following location: - https://jakarta.ee/xml/ns/jakartaee/connectors_2_0.xsd + https://jakarta.ee/xml/ns/jakartaee/connector_2_0.xsd ]]> @@ -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. @@ -187,7 +187,7 @@ interface implemented by an administered object. Example: - javax.jms.Destination + jakarta.jms.Destination ]]> @@ -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. @@ -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 @@ -529,7 +529,7 @@ OR - javax.resource.cci.ConnectionFactory + jakarta.resource.cci.ConnectionFactory ]]> @@ -569,7 +569,7 @@ Example: - javax.resource.cci.Connection + jakarta.resource.cci.Connection ]]> @@ -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 + value="jakarta.resource.spi.security.PasswordCredential"/> + value="jakarta.resource.spi.security.GenericCredential"/> @@ -907,7 +907,7 @@ Example: - javax.jms.MessageListener + jakarta.jms.MessageListener ]]> @@ -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 NoTransaction. Note that resource adapters may specify the level of transaction support to be used at runtime for a ManagedConnectionFactory through the TransactionSupport interface. @@ -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 diff --git a/jakartaee9/src/ejb-jar_4_0.xsds b/jakartaee9/src/ejb-jar_4_0.xsds index 87debda..16a5ee1 100644 --- a/jakartaee9/src/ejb-jar_4_0.xsds +++ b/jakartaee9/src/ejb-jar_4_0.xsds @@ -35,9 +35,9 @@ - The ejb-jarType defines the root element of the Enterprise Beans + The ejb-jarType defines the root element of the Jakarta Enterprise Beans deployment descriptor. It contains - an optional description of the ejb-jar file @@ -814,12 +814,12 @@ - The version specifies the version of the + The version specifies the version of the Jakarta Enterprise Beans specification that the instance document must comply with. This information enables deployment tools - to validate a particular Enterprise Beans Deployment - Descriptor with respect to a specific version of the Enterprise Beans - schema. + to validate a particular Jakarta Enterprise Beans Deployment + Descriptor with respect to a specific version of the Jakarta Enterprise + Beans schema. @@ -2577,11 +2577,11 @@ - an optional specification of the result type mapping, if the query is for a select method and entity objects are returned. - - the Enterprise Beans QL query string that defines the query. + - the Jakarta Enterprise Beans QL query string that defines the query. - Queries that are expressible in Enterprise Beans QL must use the ejb-ql - element to specify the query. If a query is not expressible - in Enterprise Beans QL, the description element should be used to + Queries that are expressible in Jakarta Enterprise Beans QL must use the + ejb-ql element to specify the query. If a query is not expressible + in Jakarta Enterprise Beans QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty. diff --git a/jakartaee9/src/jakartaee_9.xsds b/jakartaee9/src/jakartaee_9.xsds index 519daf3..807dcb2 100644 --- a/jakartaee9/src/jakartaee_9.xsds +++ b/jakartaee9/src/jakartaee_9.xsds @@ -723,7 +723,8 @@ The ejb-linkType is used by ejb-link elements in the ejb-ref or ejb-local-ref elements to specify - that an EJB reference is linked to enterprise bean. + that an Jakarta Enterprise Beans reference is linked to + enterprise bean. The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file or in another ejb-jar @@ -764,8 +765,8 @@ The declaration consists of: - an optional description - - the EJB reference name used in the code of the Deployment - Component that's referencing the enterprise bean. + - the Jakarta Enterprise Beans reference name used in the code of the + Deployment Component that's referencing the enterprise bean. - the optional expected type of the referenced enterprise bean - the optional expected local interface of the referenced enterprise bean or the local business interface of the @@ -812,9 +813,9 @@ - Configuration of a JMS Connection Factory. + Configuration of a Jakarta Messaging Connection Factory. @@ -1327,7 +1328,7 @@ - Description of this JMS Connection Factory. + Description of this Jakarta Messaging Connection Factory. @@ -1338,7 +1339,7 @@ The name element specifies the JNDI name of the - JMS connection factory being defined. + Jakarta Messaging connection factory being defined. @@ -1349,11 +1350,11 @@ - 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. + Fully-qualified name of the Jakarta Messaging connection factory + interface. Permitted values are jakarta.jms.ConnectionFactory, + jakarta.jms.QueueConnectionFactory, or + jakarta.jms.TopicConnectionFactory. If not specified, + jakarta.jms.ConnectionFactory will be used. @@ -1364,8 +1365,8 @@ - Fully-qualified name of the JMS connection factory - implementation class. Ignored if a resource adapter + Fully-qualified name of the Jakarta Messaging connection + factory implementation class. Ignored if a resource adapter is used. @@ -1424,7 +1425,7 @@ - JMS Connection Factory property. This may be a vendor-specific + Jakarta Messaging Connection Factory property. This may be a vendor-specific property or a less commonly used ConnectionFactory property. @@ -1478,7 +1479,7 @@ - Configuration of a JMS Destination. + Configuration of a Jakarta Messaging Destination. @@ -1489,7 +1490,7 @@ - Description of this JMS Destination. + Description of this Jakarta Messaging Destination. @@ -1500,7 +1501,7 @@ The name element specifies the JNDI name of the - JMS destination being defined. + Jakarta Messaging destination being defined. @@ -1510,8 +1511,8 @@ - Fully-qualified name of the JMS destination interface. - Permitted values are javax.jms.Queue and javax.jms.Topic + Fully-qualified name of the Jakarta Messaging destination interface. + Permitted values are jakarta.jms.Queue and jakarta.jms.Topic @@ -1522,7 +1523,7 @@ - Fully-qualified name of the JMS destination implementation + Fully-qualified name of the Jakarta Messaging 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. @@ -1561,7 +1562,7 @@ - JMS Destination property. This may be a vendor-specific + Jakarta Messaging Destination property. This may be a vendor-specific property or a less commonly used Destination property. @@ -2020,9 +2021,9 @@ provider. Vendor-specific properties may be included in the set of properties. Properties that are not recognized by a vendor must be ignored. Entries that make use of the - namespace javax.persistence and its subnamespaces must not + namespace jakarta.persistence and its subnamespaces must not be used for vendor-specific properties. The namespace - javax.persistence is reserved for use by the specification. + jakarta.persistence is reserved for use by the specification. @@ -2241,7 +2242,7 @@ jms/StockQueue - javax.jms.Queue + jakarta.jms.Queue @@ -2890,7 +2891,7 @@ jms/StockQueue - javax.jms.Queue + jakarta.jms.Queue Consumes @@ -2979,7 +2980,7 @@ Example: - javax.jms.Queue + jakarta.jms.Queue ]]> diff --git a/jakartaee9/src/jakartaee_web_services_2_0.xsds b/jakartaee9/src/jakartaee_web_services_2_0.xsds index b449e45..e8dfd7c 100644 --- a/jakartaee9/src/jakartaee_web_services_2_0.xsds +++ b/jakartaee9/src/jakartaee_web_services_2_0.xsds @@ -118,8 +118,8 @@ The webservice-description-name identifies the collection of - port-components associated with a WSDL file and JAX-RPC mapping. The - name must be unique within the deployment descriptor. + port-components associated with a WSDL file and Jakarta XML RPC mapping. + The name must be unique within the deployment descriptor. @@ -140,8 +140,8 @@ representations, WSDL port QName, Service Endpoint Interface, Service Implementation Bean. - This element also associates a WSDL service with a JAX-WS Provider - implementation. + This element also associates a WSDL service with a Jakarta Enterprise Web + Services Provider implementation. @@ -186,7 +186,8 @@ Defines the name space and local name part of the WSDL service QName. This is required to be specified for - port components that are JAX-WS Provider implementations. + port components that are JAX-Jakarta Enterprise Web Services + Provider implementations. @@ -199,7 +200,8 @@ Defines the name space and local name part of the WSDL port QName. This is not required to be specified for port - components that are JAX-WS Provider implementations + components that are JAX-Jakarta Enterprise Web Services Provider + implementations @@ -213,7 +215,7 @@ Used to enable or disable SOAP MTOM/XOP mechanism for an endpoint implementation. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -227,7 +229,7 @@ When MTOM is enabled, binary data above this size in bytes will be XOP encoded or sent as attachment. Default value is 0. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -238,13 +240,13 @@ - This specifies the WS-Addressing requirements for a JAX-WS - web service. It corresponds to javax.xml.ws.soap.Addressing - annotation or its feature javax.xml.ws.soap.AddressingFeature. + This specifies the WS-Addressing requirements for a Jakarta Enterprise Web + Services web service. It corresponds to jakarta.xml.ws.soap.Addressing + annotation or its feature jakarta.xml.ws.soap.AddressingFeature. See the addressingType for more information. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -255,13 +257,13 @@ - Corresponds to the javax.xml.ws.RespectBinding annotation - or its corresponding javax.xml.ws.RespectBindingFeature web - service feature. This is used to control whether a JAX-WS - implementation must respect/honor the contents of the + Corresponds to the jakarta.xml.ws.RespectBinding annotation + or its corresponding jakarta.xml.ws.RespectBindingFeature web + service feature. This is used to control whether a Jakarta Enterprise Web + Services implementation must respect/honor the contents of the wsdl:binding in the WSDL that is associated with the service. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -316,7 +318,7 @@ minOccurs="0" maxOccurs="unbounded"> - To be used with JAX-RPC based runtime only. + To be used with Jakarta XML RPC based runtime only. @@ -325,7 +327,7 @@ minOccurs="0" maxOccurs="1"> - To be used with JAX-WS based runtime only. + To be used with Jakarta Enterprise Web Services based runtime only. @@ -342,9 +344,9 @@ The service-impl-bean element defines the web service implementation. - A service implementation can be an EJB bean class or JAX-RPC web - component. Existing EJB implementations are exposed as a web service - using an ejb-link. + A service implementation can be an Jakarta Enterprise Beans bean class or + Jakarta XML RPC web component. Existing Jakarta Enterprise Beans implementations + are exposed as a web service using an ejb-link. Used in: port-component @@ -368,10 +370,10 @@ The servlet-link element is used in the service-impl-bean element to specify that a Service Implementation Bean is defined as a - JAX-RPC Service Endpoint. + Jakarta XML RPC Service Endpoint. The value of the servlet-link element must be the servlet-name of - a JAX-RPC Service Endpoint in the same WAR file. + a Jakarta XML RPC Service Endpoint in the same WAR file. Used in: service-impl-bean @@ -421,7 +423,7 @@ The webservice-description-name identifies the collection of - port-components associated with a WSDL file and JAX-RPC + port-components associated with a WSDL file and Jakarta XML RPC mapping. The name must be unique within the deployment descriptor. @@ -446,11 +448,12 @@ The jaxrpc-mapping-file element contains the name of a file that - describes the JAX-RPC mapping between the Java interaces used by + describes the Jakarta XML RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module. - This is not required when JAX-WS based runtime is used. + This is not required when JAX-Jakarta Enterprise Web Services based + runtime is used. diff --git a/jakartaee9/src/jakartaee_web_services_client_2_0.xsds b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds index 1a0972b..6965700 100644 --- a/jakartaee9/src/jakartaee_web_services_client_2_0.xsds +++ b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds @@ -47,7 +47,7 @@ service. It contains optional description, display name and icons, a declaration of the required Service interface, an optional WSDL document location, an optional set - of JAX-RPC mappings, an optional QName for the service element, + of Jakarta XML RPC mappings, an optional QName for the service element, an optional set of Service Endpoint Interfaces to be resolved by the container to a WSDL port, and an optional set of handlers. @@ -76,9 +76,9 @@ The service-interface element declares the fully qualified class - name of the JAX-RPC Service interface the client depends on. - In most cases the value will be javax.xml.rpc.Service. A JAX-RPC - generated Service Interface class may also be specified. + name of the Jakarta XML RPC Service interface the client depends on. + In most cases the value will be jakarta.xml.rpc.Service. A Jakarta XML + RPC generated Service Interface class may also be specified. @@ -94,9 +94,9 @@ element that is injected or returned when a JNDI lookup is done. This must be either a fully qualified name of Service class or the fully qualified name of service endpoint interface class. - This is only used with JAX-WS runtime where the corresponding - @WebServiceRef annotation can be used to denote both a Service - or a Port. + This is only used with Jakarta Enterprise Web Services runtime where + the corresponding @WebServiceRef annotation can be used to denote both + a Service or a Port. If this is not specified, then the type of service-ref element that is injected or returned when a JNDI lookup is done is @@ -126,11 +126,12 @@ The jaxrpc-mapping-file element contains the name of a file that - describes the JAX-RPC mapping between the Java interaces used by + describes the Jakarta XML RPC mapping between the Java interaces used by the application and the WSDL description in the wsdl-file. The file name is a relative path within the module file. - This is not required when JAX-WS based runtime is used. + This is not required when Jakarta Enterprise Web Services based + runtime is used. @@ -179,7 +180,7 @@ handler is assumed to be associated with all ports of the service. - To be used with JAX-RPC based runtime only. + To be used with Jakarta XML RPC based runtime only. @@ -189,7 +190,7 @@ minOccurs="0" maxOccurs="1"> - To be used with JAX-WS based runtime only. + To be used with Jakarta Enterprise Web Services based runtime only. @@ -235,9 +236,9 @@ Used to enable or disable SOAP MTOM/XOP mechanism on the client - side for a port-component. + side for a port-component. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -251,7 +252,7 @@ When MTOM is enabled, binary data above this size in bytes should be XOP encoded or sent as attachment. Default value is 0. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -262,13 +263,13 @@ - This specifies the WS-Addressing requirements for a JAX-WS - web service. It corresponds to javax.xml.ws.soap.Addressing - annotation or its feature javax.xml.ws.soap.AddressingFeature. + This specifies the WS-Addressing requirements for a Jakarta Enterprise Web + Services web service. It corresponds to jakarta.xml.ws.soap.Addressing + annotation or its feature jakarta.xml.ws.soap.AddressingFeature. See the addressingType for more information. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -279,13 +280,13 @@ - Corresponds to the javax.xml.ws.RespectBinding annotation - or its corresponding javax.xml.ws.RespectBindingFeature web - service feature. This is used to control whether a JAX-WS - implementation must respect/honor the contents of the + Corresponds to the jakarta.xml.ws.RespectBinding annotation + or its corresponding jakarta.xml.ws.RespectBindingFeature web + service feature. This is used to control whether a Jakarta Enterprise Web + Services implementation must respect/honor the contents of the wsdl:binding in the WSDL that is associated with the service. - Not to be specified for JAX-RPC runtime + Not to be specified for Jakarta XML RPC runtime @@ -501,9 +502,9 @@ - This specifies the WS-Addressing requirements for a JAX-WS web service. - It corresponds to javax.xml.ws.soap.Addressing annotation or its - feature javax.xml.ws.soap.AddressingFeature. + This specifies the WS-Addressing requirements for a Jakarta Enterprise Web Services + web service. It corresponds to jakarta.xml.ws.soap.Addressing annotation or its + feature jakarta.xml.ws.soap.AddressingFeature. If the "enabled" element is "true", WS-Addressing is enabled. It means that the endpoint supports WS-Addressing but does not require @@ -563,10 +564,10 @@ - Corresponds to the javax.xml.ws.RespectBinding annotation - or its corresponding javax.xml.ws.RespectBindingFeature web - service feature. This is used to control whether a JAX-WS - implementation must respect/honor the contents of the + Corresponds to the jakarta.xml.ws.RespectBinding annotation + or its corresponding jakarta.xml.ws.RespectBindingFeature web + service feature. This is used to control whether a Jakarta Enterprise + Web Services implementation must respect/honor the contents of the wsdl:binding in the WSDL that is associated with the service. If the "enabled" element is "true", wsdl:binding in the @@ -624,7 +625,7 @@ - Not to be specified for JAX-WS runtime + Not to be specified for Jakarta Enterprise Web Services runtime @@ -639,7 +640,7 @@ Defines the QName of a SOAP header that will be processed by the handler. - Not to be specified for JAX-WS runtime + Not to be specified for Jakarta Enterprise Web Services runtime @@ -667,7 +668,7 @@ specified, the handler is assumed to be associated with all ports of the service. - Not to be specified for JAX-WS runtime + Not to be specified for Jakarta Enterprise Web Services runtime diff --git a/jakartaee9/src/web-app_5_0.xsds b/jakartaee9/src/web-app_5_0.xsds index ede9524..d0992b0 100644 --- a/jakartaee9/src/web-app_5_0.xsds +++ b/jakartaee9/src/web-app_5_0.xsds @@ -127,8 +127,9 @@ - The ejb-local-ref-name element contains the name of an EJB - reference. The EJB reference is an entry in the web + The ejb-local-ref-name element contains the name of an + Jakarta Enterprise Beans reference. The Jakarta Enterprise + Beans reference is an entry in the web application's environment and is relative to the java:comp/env context. The name must be unique within the web application. @@ -145,11 +146,11 @@ - The ejb-ref-name element contains the name of an EJB - reference. The EJB reference is an entry in the web - application's environment and is relative to the - 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 + reference is an entry in the web application's environment + and is relative to the java:comp/env context. + The name must be unique within the web application. It is recommended that name is prefixed with "ejb/". diff --git a/jakartaee9/src/web-facelettaglibrary_3_0.xsds b/jakartaee9/src/web-facelettaglibrary_3_0.xsds index 5fbfe0e..d8a2017 100644 --- a/jakartaee9/src/web-facelettaglibrary_3_0.xsds +++ b/jakartaee9/src/web-facelettaglibrary_3_0.xsds @@ -39,8 +39,8 @@ Standard Facelets View Declaration Language (Facelets VDL) (Version 3.0).

-

JSF 3.0 Facelet Tag Libraries that wish to conform to this - schema must declare it in the following manner.

+

Jakarta Server faces 3.0 Facelet Tag Libraries that wish to conform to + this schema must declare it in the following manner.

<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -403,7 +403,7 @@ Within a tag element, the behavior element encapsulates - information specific to a JSF Behavior. + information specific to a Jakarta Server Faces Behavior.

]]> @@ -455,7 +455,7 @@

Within a tag element, the component - element encapsulates information specific to a JSF + element encapsulates information specific to a Jakarta Server Faces UIComponent.

@@ -539,7 +539,7 @@ or <handler-class> among its child elements.

Within a tag element, the converter element encapsulates - information specific to a JSF Converter. + information specific to a Jakarta Server Faces Converter.

]]> @@ -590,7 +590,7 @@ or <handler-class> among its child elements.

Within a tag element, the validator element encapsulates - information specific to a JSF Validator. + information specific to a Jakarta Server Faces Validator.

]]> diff --git a/jakartaee9/src/web-facesconfig_3_0.xsds b/jakartaee9/src/web-facesconfig_3_0.xsds index 80a182f..c0d5598 100644 --- a/jakartaee9/src/web-facesconfig_3_0.xsds +++ b/jakartaee9/src/web-facesconfig_3_0.xsds @@ -229,7 +229,7 @@ configuration resource file located at "WEB-INF/faces-config.xml". The presence of this attribute on any application configuration resource other than the one located at "WEB-INF/faces-config.xml", - including any files named using the javax.faces.CONFIG_FILES + including any files named using the jakarta.faces.CONFIG_FILES attribute, must be ignored. If metadata-complete is set to "true", the JavaServer Faces @@ -392,7 +392,8 @@ 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.

+ the Jakarta Server Faces implementation must provide a suitable + default.

]]> @@ -448,8 +449,8 @@ NavigationHandler implementation class that will be called during the Invoke Application phase of the request processing lifecycle, if the - default ActionListener (provided by the JSF - implementation) is used.

+ default ActionListener (provided by the Jakarta Server + Faces implementation) is used.

]]> @@ -493,7 +494,7 @@

The "el-resolver" element contains the fully qualified class name of the concrete - javax.el.ELResolver implementation class + jakarta.el.ELResolver implementation class that will be used during the processing of EL expressions.

@@ -566,7 +567,7 @@

The "search-expression-handler" element contains the fully qualified class name of the - concrete javax.faces.component.search.SearchExpressionHandler + concrete jakarta.faces.component.search.SearchExpressionHandler implementation class that will be used for processing of a search expression.

@@ -580,7 +581,7 @@

The "search-keyword-resolver" element contains the fully qualified class name of the - concrete javax.faces.component.search.SearchKeywordResolver + concrete jakarta.faces.component.search.SearchKeywordResolver implementation class that will be used during the processing of a search expression keyword.

@@ -766,8 +767,8 @@

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.

+ specified, the Jakarta Server Faces implementation must provide a + suitable default.

]]> @@ -2918,8 +2919,8 @@ which must contain exactly one <flow-id> element.

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 + url-patterns in this element may only be reached from another Jakarta Server + Faces 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.

diff --git a/jakartaee9/src/web-fragment_5_0.xsds b/jakartaee9/src/web-fragment_5_0.xsds index ceab073..98823ec 100644 --- a/jakartaee9/src/web-fragment_5_0.xsds +++ b/jakartaee9/src/web-fragment_5_0.xsds @@ -127,10 +127,10 @@ - The ejb-local-ref-name element contains the name of an EJB - reference. The EJB reference is an entry in the web - application's environment and is relative to the - java:comp/env context. The name must be unique within + The ejb-local-ref-name element contains the name of an Jakarta + Enterprise Beans reference. The Jakarta Enterprise Beans reference + is an entry in the web application's environment and is relative + to the java:comp/env context. The name must be unique within the web application. It is recommended that name is prefixed with "ejb/". @@ -145,10 +145,10 @@ - The ejb-ref-name element contains the name of an EJB - reference. The EJB reference is an entry in the web - application's environment and is relative to the - java:comp/env context. The name must be unique within + The ejb-ref-name element contains the name of an Jakarta + Enterprise Beans reference. The Jakarta Enterprise Beans reference + is an entry in the web application's environment and is relative + to the java:comp/env context. The name must be unique within the web application. It is recommended that name is prefixed with "ejb/". diff --git a/jakartaee9/test/app-client-complete.xml b/jakartaee9/test/app-client-complete.xml index 6274634..73bb572 100644 --- a/jakartaee9/test/app-client-complete.xml +++ b/jakartaee9/test/app-client-complete.xml @@ -134,12 +134,12 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces diff --git a/jakartaee9/test/app-client-data-source.xml b/jakartaee9/test/app-client-data-source.xml index 55eb302..5400035 100644 --- a/jakartaee9/test/app-client-data-source.xml +++ b/jakartaee9/test/app-client-data-source.xml @@ -87,12 +87,12 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue POPD jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces StockJMS diff --git a/jakartaee9/test/app-client-handler.xml b/jakartaee9/test/app-client-handler.xml index 87986cd..6d789bf 100644 --- a/jakartaee9/test/app-client-handler.xml +++ b/jakartaee9/test/app-client-handler.xml @@ -28,7 +28,7 @@ HandlerInfoTestClnt_client service/handlerinfohandler - javax.xml.rpc.Service + jakarta.xml.rpc.Service META-INF/wsdl/HelloService.wsdl HelloService.xml diff --git a/jakartaee9/test/app-client-injection.xml b/jakartaee9/test/app-client-injection.xml index 100e46f..0e6f81b 100644 --- a/jakartaee9/test/app-client-injection.xml +++ b/jakartaee9/test/app-client-injection.xml @@ -170,11 +170,11 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces diff --git a/jakartaee9/test/app-client-mapped-name.xml b/jakartaee9/test/app-client-mapped-name.xml index 815b7dc..eda4b1e 100644 --- a/jakartaee9/test/app-client-mapped-name.xml +++ b/jakartaee9/test/app-client-mapped-name.xml @@ -87,12 +87,12 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue POPD jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces StockJMS diff --git a/jakartaee9/test/app-client-module.xml b/jakartaee9/test/app-client-module.xml index cdb3b9b..44b4087 100644 --- a/jakartaee9/test/app-client-module.xml +++ b/jakartaee9/test/app-client-module.xml @@ -152,24 +152,24 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces diff --git a/jakartaee9/test/app-client-resources.xml b/jakartaee9/test/app-client-resources.xml index 8872d03..57cb167 100644 --- a/jakartaee9/test/app-client-resources.xml +++ b/jakartaee9/test/app-client-resources.xml @@ -87,12 +87,12 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue POPD jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces StockJMS @@ -145,7 +145,7 @@ A partial JMSConnectionFactory definition java:app/MyApp/myJMSCF - javax.jms.QueueConnectionFactory + jakarta.jms.QueueConnectionFactory true 5 @@ -156,7 +156,7 @@ JMS Queue definition java:app/MyApp/myJMSQ - javax.jms.Queue + jakarta.jms.Queue com.example.myQueueImpl MYRA Queue10 diff --git a/jakartaee9/test/app-client.xml b/jakartaee9/test/app-client.xml index 3f2584b..70dee3f 100644 --- a/jakartaee9/test/app-client.xml +++ b/jakartaee9/test/app-client.xml @@ -150,24 +150,24 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces diff --git a/jakartaee9/test/application-resources.xml b/jakartaee9/test/application-resources.xml index 3fb8996..6bcf9a7 100644 --- a/jakartaee9/test/application-resources.xml +++ b/jakartaee9/test/application-resources.xml @@ -162,12 +162,12 @@ java:app/whatever/POPD - javax.jms.Queue + jakarta.jms.Queue java:app/jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces @@ -209,7 +209,7 @@ A partial JMSConnectionFactory definition java:app/MyApp/myJMSCF com.example.QueueConnectionFactoryImpl - javax.jms.QueueConnectionFactory + jakarta.jms.QueueConnectionFactory true 5 @@ -220,7 +220,7 @@ JMS Queue definition java:app/MyApp/myJMSQ - javax.jms.Queue + jakarta.jms.Queue MYRA Queue10 diff --git a/jakartaee9/test/connector-complete.xml b/jakartaee9/test/connector-complete.xml index 1c82695..e71333e 100644 --- a/jakartaee9/test/connector-complete.xml +++ b/jakartaee9/test/connector-complete.xml @@ -83,7 +83,7 @@ XATransaction BasicPassword - javax.resource.spi.security.PasswordCredential + jakarta.resource.spi.security.PasswordCredential false diff --git a/jakartaee9/test/connector.xml b/jakartaee9/test/connector.xml index b0ec1ef..8a9b779 100644 --- a/jakartaee9/test/connector.xml +++ b/jakartaee9/test/connector.xml @@ -103,7 +103,7 @@ BasicPassword - javax.resource.spi.security.PasswordCredentialTYPO + jakarta.resource.spi.security.PasswordCredentialTYPO false diff --git a/jakartaee9/test/ejb-jar-complete.xml b/jakartaee9/test/ejb-jar-complete.xml index 8c56aee..3720db6 100644 --- a/jakartaee9/test/ejb-jar-complete.xml +++ b/jakartaee9/test/ejb-jar-complete.xml @@ -56,12 +56,12 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces diff --git a/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml b/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml index 14984cb..d0ac0f8 100644 --- a/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml +++ b/jakartaee9/test/ejb-jar-persistence-no-lookup-name.xml @@ -111,24 +111,24 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces @@ -138,7 +138,7 @@ persistence/context1 foo - javax.persisstence.Foo + jakarta.persistence.Foo foo diff --git a/jakartaee9/test/ejb-jar.xml b/jakartaee9/test/ejb-jar.xml index a36a568..e167837 100644 --- a/jakartaee9/test/ejb-jar.xml +++ b/jakartaee9/test/ejb-jar.xml @@ -111,24 +111,24 @@ whatever/POPD - javax.jms.Queue + jakarta.jms.Queue whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces @@ -138,7 +138,7 @@ persistence/context1 foo - javax.persisstence.Foo + jakarta.persisstence.Foo foo @@ -217,24 +217,24 @@ lineitemId whatever/POPD - javax.jms.Queue + jakarta.jms.Queue whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces @@ -259,30 +259,30 @@ destinationMode - javax.jms.Queue + jakarta.jms.Queue whatever/POPD - javax.jms.Queue + jakarta.jms.Queue whatever/POPD - javax.jms.Queue + jakarta.jms.Queue jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces jms/Stocks - javax.jms.Queue + jakarta.jms.Queue Produces @@ -1847,7 +1847,7 @@ Home remove - javax.ejb.Handle + jakarta.ejb.Handle Required @@ -2635,7 +2635,7 @@ Home remove - javax.ejb.Handle + jakarta.ejb.Handle Required diff --git a/jakartaee9/test/web-app-resources.xml b/jakartaee9/test/web-app-resources.xml index bfe3353..a3369ec 100644 --- a/jakartaee9/test/web-app-resources.xml +++ b/jakartaee9/test/web-app-resources.xml @@ -210,7 +210,7 @@ A partial JMSConnectionFactory definition java:app/MyApp/myJMSCF - javax.jms.QueueConnectionFactory + jakarta.jms.QueueConnectionFactory com.example.QueueConnectionFactoryImpl true 5 @@ -222,7 +222,7 @@ JMS Queue definition java:app/MyApp/myJMSQ - javax.jms.Queue + jakarta.jms.Queue com.example.QueueImpl MYRA Queue10 diff --git a/jakartaee9/test/web-facelettaglibrary-pathological-0.xml b/jakartaee9/test/web-facelettaglibrary-pathological-0.xml index 7a6e40f..a431fbc 100644 --- a/jakartaee9/test/web-facelettaglibrary-pathological-0.xml +++ b/jakartaee9/test/web-facelettaglibrary-pathological-0.xml @@ -28,7 +28,7 @@ regexValidator - javax.faces.RegularExpression + jakarta.faces.RegularExpression compositeTest diff --git a/jakartaee9/test/web-facelettaglibrary-standard.xml b/jakartaee9/test/web-facelettaglibrary-standard.xml index 31056af..e42ec39 100644 --- a/jakartaee9/test/web-facelettaglibrary-standard.xml +++ b/jakartaee9/test/web-facelettaglibrary-standard.xml @@ -27,7 +27,7 @@ regexValidator - javax.faces.RegularExpression + jakarta.faces.RegularExpression diff --git a/jakartaee9/test/web-facesconfig-standard.xml b/jakartaee9/test/web-facesconfig-standard.xml index c1a1b81..77e3248 100644 --- a/jakartaee9/test/web-facesconfig-standard.xml +++ b/jakartaee9/test/web-facesconfig-standard.xml @@ -313,7 +313,7 @@ usernamecomponent - javax.faces.component.UIInput + jakarta.faces.component.UIInput request @@ -331,18 +331,18 @@ CUSTOM com.sun.faces.systest.render.CustomRenderKitImpl - javax.faces.Output - javax.faces.Text + jakarta.faces.Output + jakarta.faces.Text com.sun.faces.systest.render.TextRenderer - javax.faces.Form - javax.faces.Form + jakarta.faces.Form + jakarta.faces.Form com.sun.faces.systest.render.FormRenderer - javax.faces.Command - javax.faces.Button + jakarta.faces.Command + jakarta.faces.Button com.sun.faces.systest.render.ButtonRenderer From c24b377c0755f13d2e0fecad8060cf73777b5d2a Mon Sep 17 00:00:00 2001 From: "Ivan St. Ivanov" Date: Mon, 20 Apr 2020 10:46:54 +0300 Subject: [PATCH 5/5] Distinguish between specification name and terminology in the schema documentation Signed-off-by: Ivan St. Ivanov --- jakartaee9/src/application-client_9.xsds | 8 ++-- jakartaee9/src/connector_2_0.xsds | 4 +- jakartaee9/src/ejb-jar_4_0.xsds | 22 +++++----- jakartaee9/src/jakartaee_9.xsds | 42 +++++++++---------- .../src/jakartaee_web_services_2_0.xsds | 20 ++++----- .../jakartaee_web_services_client_2_0.xsds | 22 +++++----- jakartaee9/src/web-app_5_0.xsds | 10 ++--- jakartaee9/src/web-common_5_0.xsds | 2 +- jakartaee9/src/web-facelettaglibrary_3_0.xsds | 11 +++-- jakartaee9/src/web-fragment_5_0.xsds | 10 ++--- 10 files changed, 74 insertions(+), 77 deletions(-) diff --git a/jakartaee9/src/application-client_9.xsds b/jakartaee9/src/application-client_9.xsds index dfb606c..87081dd 100644 --- a/jakartaee9/src/application-client_9.xsds +++ b/jakartaee9/src/application-client_9.xsds @@ -83,8 +83,8 @@ The application-client element is the root element of an application client deployment descriptor. The application - client deployment descriptor describes the Jakarta Enterprise - Beans components and external resources referenced by the + client deployment descriptor describes the enterprise bean + components and external resources referenced by the application client. @@ -109,8 +109,8 @@ - The ejb-ref-name element contains the name of an Jakarta Enterprise - Beans reference. The Jakarta Enterprise Beans reference is an entry + 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. diff --git a/jakartaee9/src/connector_2_0.xsds b/jakartaee9/src/connector_2_0.xsds index 4040d66..6dd8214 100644 --- a/jakartaee9/src/connector_2_0.xsds +++ b/jakartaee9/src/connector_2_0.xsds @@ -35,9 +35,9 @@ - The ejb-jarType defines the root element of the Jakarta Enterprise Beans + The ejb-jarType defines the root element of the Enterprise Beans deployment descriptor. It contains - an optional description of the ejb-jar file @@ -814,12 +814,12 @@ - The version specifies the version of the Jakarta + The version specifies the version of the Enterprise Beans specification that the instance document must comply with. This information enables deployment tools - to validate a particular Jakarta Enterprise Beans Deployment - Descriptor with respect to a specific version of the Jakarta Enterprise - Beans schema. + to validate a particular Enterprise Beans Deployment + Descriptor with respect to a specific version of the Enterprise Beans + schema. @@ -2577,11 +2577,11 @@ - an optional specification of the result type mapping, if the query is for a select method and entity objects are returned. - - the Jakarta Enterprise Beans QL query string that defines the query. + - the Enterprise Beans QL query string that defines the query. - Queries that are expressible in Jakarta Enterprise Beans QL must use the - ejb-ql element to specify the query. If a query is not expressible - in Jakarta Enterprise Beans QL, the description element should be used to + Queries that are expressible in Enterprise Beans QL must use the ejb-ql + element to specify the query. If a query is not expressible + in Enterprise Beans QL, the description element should be used to describe the semantics of the query and the ejb-ql element should be empty. diff --git a/jakartaee9/src/jakartaee_9.xsds b/jakartaee9/src/jakartaee_9.xsds index 807dcb2..2b871d8 100644 --- a/jakartaee9/src/jakartaee_9.xsds +++ b/jakartaee9/src/jakartaee_9.xsds @@ -723,8 +723,7 @@ The ejb-linkType is used by ejb-link elements in the ejb-ref or ejb-local-ref elements to specify - that an Jakarta Enterprise Beans reference is linked to - enterprise bean. + that an enterprise bean reference is linked to enterprise bean. The value of the ejb-link element must be the ejb-name of an enterprise bean in the same ejb-jar file or in another ejb-jar @@ -765,7 +764,7 @@ The declaration consists of: - an optional description - - the Jakarta Enterprise Beans reference name used in the code of the + - the enterprise bean's reference name used in the code of the Deployment Component that's referencing the enterprise bean. - the optional expected type of the referenced enterprise bean - the optional expected local interface of the referenced @@ -813,11 +812,10 @@ - Configuration of a Jakarta Messaging Connection Factory. + Configuration of a Messaging Connection Factory. @@ -1328,7 +1326,7 @@ - Description of this Jakarta Messaging Connection Factory. + Description of this Messaging Connection Factory. @@ -1339,7 +1337,7 @@ The name element specifies the JNDI name of the - Jakarta Messaging connection factory being defined. + messaging connection factory being defined. @@ -1350,7 +1348,7 @@ - Fully-qualified name of the Jakarta Messaging connection factory + Fully-qualified name of the messaging connection factory interface. Permitted values are jakarta.jms.ConnectionFactory, jakarta.jms.QueueConnectionFactory, or jakarta.jms.TopicConnectionFactory. If not specified, @@ -1365,8 +1363,8 @@ - Fully-qualified name of the Jakarta Messaging connection - factory implementation class. Ignored if a resource adapter + Fully-qualified name of the messaging connection factory + implementation class. Ignored if a resource adapter is used. @@ -1425,7 +1423,7 @@ - Jakarta Messaging Connection Factory property. This may be a vendor-specific + Messaging Connection Factory property. This may be a vendor-specific property or a less commonly used ConnectionFactory property. @@ -1479,7 +1477,7 @@ - Configuration of a Jakarta Messaging Destination. + Configuration of a Messaging Destination. @@ -1490,7 +1488,7 @@ - Description of this Jakarta Messaging Destination. + Description of this Messaging Destination. @@ -1501,7 +1499,7 @@ The name element specifies the JNDI name of the - Jakarta Messaging destination being defined. + messaging destination being defined. @@ -1511,7 +1509,7 @@ - Fully-qualified name of the Jakarta Messaging destination interface. + Fully-qualified name of the messaging destination interface. Permitted values are jakarta.jms.Queue and jakarta.jms.Topic @@ -1523,7 +1521,7 @@ - Fully-qualified name of the Jakarta Messaging destination implementation + Fully-qualified name of the messaging 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. @@ -1562,7 +1560,7 @@ - Jakarta Messaging Destination property. This may be a vendor-specific + Messaging Destination property. This may be a vendor-specific property or a less commonly used Destination property. diff --git a/jakartaee9/src/jakartaee_web_services_2_0.xsds b/jakartaee9/src/jakartaee_web_services_2_0.xsds index e8dfd7c..1d3b846 100644 --- a/jakartaee9/src/jakartaee_web_services_2_0.xsds +++ b/jakartaee9/src/jakartaee_web_services_2_0.xsds @@ -140,8 +140,8 @@ representations, WSDL port QName, Service Endpoint Interface, Service Implementation Bean. - This element also associates a WSDL service with a Jakarta Enterprise Web - Services Provider implementation. + This element also associates a WSDL service with a Jakarta XML Web Services + Provider implementation. @@ -186,7 +186,7 @@ Defines the name space and local name part of the WSDL service QName. This is required to be specified for - port components that are JAX-Jakarta Enterprise Web Services + port components that are Jakarta XML Web Services Provider implementations. @@ -200,7 +200,7 @@ Defines the name space and local name part of the WSDL port QName. This is not required to be specified for port - components that are JAX-Jakarta Enterprise Web Services Provider + components that are Jakarta XML Web Services Provider implementations @@ -240,8 +240,8 @@ - This specifies the WS-Addressing requirements for a Jakarta Enterprise Web - Services web service. It corresponds to jakarta.xml.ws.soap.Addressing + This specifies the WS-Addressing requirements for a Jakarta XML + web service. It corresponds to jakarta.xml.ws.soap.Addressing annotation or its feature jakarta.xml.ws.soap.AddressingFeature. See the addressingType for more information. @@ -259,7 +259,7 @@ Corresponds to the jakarta.xml.ws.RespectBinding annotation or its corresponding jakarta.xml.ws.RespectBindingFeature web - service feature. This is used to control whether a Jakarta Enterprise Web + service feature. This is used to control whether a Jakarta XML Web Services implementation must respect/honor the contents of the wsdl:binding in the WSDL that is associated with the service. @@ -327,7 +327,7 @@ minOccurs="0" maxOccurs="1"> - To be used with Jakarta Enterprise Web Services based runtime only. + To be used with Jakarta XML Web Services based runtime only. @@ -344,8 +344,8 @@ The service-impl-bean element defines the web service implementation. - A service implementation can be an Jakarta Enterprise Beans bean class or - Jakarta XML RPC web component. Existing Jakarta Enterprise Beans implementations + A service implementation can be an enterprise bean class or Jakarta + XML RPC web component. Existing enterprise bean implementations are exposed as a web service using an ejb-link. Used in: port-component diff --git a/jakartaee9/src/jakartaee_web_services_client_2_0.xsds b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds index 6965700..6694577 100644 --- a/jakartaee9/src/jakartaee_web_services_client_2_0.xsds +++ b/jakartaee9/src/jakartaee_web_services_client_2_0.xsds @@ -94,7 +94,7 @@ element that is injected or returned when a JNDI lookup is done. This must be either a fully qualified name of Service class or the fully qualified name of service endpoint interface class. - This is only used with Jakarta Enterprise Web Services runtime where + This is only used with Jakarta XML Web Services runtime where the corresponding @WebServiceRef annotation can be used to denote both a Service or a Port. @@ -190,7 +190,7 @@ minOccurs="0" maxOccurs="1"> - To be used with Jakarta Enterprise Web Services based runtime only. + To be used with Jakarta XML Web Services based runtime only. @@ -263,8 +263,8 @@ - This specifies the WS-Addressing requirements for a Jakarta Enterprise Web - Services web service. It corresponds to jakarta.xml.ws.soap.Addressing + This specifies the WS-Addressing requirements for a Jakarta XML + web service. It corresponds to jakarta.xml.ws.soap.Addressing annotation or its feature jakarta.xml.ws.soap.AddressingFeature. See the addressingType for more information. @@ -282,7 +282,7 @@ Corresponds to the jakarta.xml.ws.RespectBinding annotation or its corresponding jakarta.xml.ws.RespectBindingFeature web - service feature. This is used to control whether a Jakarta Enterprise Web + service feature. This is used to control whether a Jakarta XML Web Services implementation must respect/honor the contents of the wsdl:binding in the WSDL that is associated with the service. @@ -502,8 +502,8 @@ - This specifies the WS-Addressing requirements for a Jakarta Enterprise Web Services - web service. It corresponds to jakarta.xml.ws.soap.Addressing annotation or its + This specifies the WS-Addressing requirements for a Jakarta XML web + service. It corresponds to jakarta.xml.ws.soap.Addressing annotation or its feature jakarta.xml.ws.soap.AddressingFeature. If the "enabled" element is "true", WS-Addressing is enabled. @@ -566,7 +566,7 @@ Corresponds to the jakarta.xml.ws.RespectBinding annotation or its corresponding jakarta.xml.ws.RespectBindingFeature web - service feature. This is used to control whether a Jakarta Enterprise + service feature. This is used to control whether a Jakarta XML Web Services implementation must respect/honor the contents of the wsdl:binding in the WSDL that is associated with the service. @@ -625,7 +625,7 @@ - Not to be specified for Jakarta Enterprise Web Services runtime + Not to be specified for Jakarta XML Web Services runtime @@ -640,7 +640,7 @@ Defines the QName of a SOAP header that will be processed by the handler. - Not to be specified for Jakarta Enterprise Web Services runtime + Not to be specified for Jakarta XML Web Services runtime @@ -668,7 +668,7 @@ specified, the handler is assumed to be associated with all ports of the service. - Not to be specified for Jakarta Enterprise Web Services runtime + Not to be specified for Jakarta XML Web Services runtime diff --git a/jakartaee9/src/web-app_5_0.xsds b/jakartaee9/src/web-app_5_0.xsds index d0992b0..edf1ae8 100644 --- a/jakartaee9/src/web-app_5_0.xsds +++ b/jakartaee9/src/web-app_5_0.xsds @@ -35,7 +35,7 @@ The ejb-local-ref-name element contains the name of an - Jakarta Enterprise Beans reference. The Jakarta Enterprise - Beans reference is an entry in the web + enterprise bean reference. The enterprise + bean reference is an entry in the web application's environment and is relative to the java:comp/env context. The name must be unique within the web application. @@ -146,8 +146,8 @@ - The ejb-ref-name element contains the name of an Jakarta - Enterprise Beans reference. The Jakarta Enterprise Beans + The ejb-ref-name element contains the name of an + enterprise bean reference. The enterprise bean reference is an entry in the web application's environment and is relative to the java:comp/env context. The name must be unique within the web application. diff --git a/jakartaee9/src/web-common_5_0.xsds b/jakartaee9/src/web-common_5_0.xsds index 42f8122..9ee344d 100644 --- a/jakartaee9/src/web-common_5_0.xsds +++ b/jakartaee9/src/web-common_5_0.xsds @@ -35,7 +35,7 @@ -

Jakarta Server faces 3.0 Facelet Tag Libraries that wish to conform to +

Jakarta Server Faces 3.0 Facelet Tag Libraries that wish to conform to this schema must declare it in the following manner.

<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee" @@ -403,7 +403,7 @@ Within a tag element, the behavior element encapsulates - information specific to a Jakarta Server Faces Behavior. + information specific to a Faces Behavior.

]]> @@ -455,8 +455,7 @@

Within a tag element, the component - element encapsulates information specific to a Jakarta Server Faces - UIComponent.

+ element encapsulates information specific to a Faces UIComponent.

@@ -539,7 +538,7 @@ or <handler-class> among its child elements.

Within a tag element, the converter element encapsulates - information specific to a Jakarta Server Faces Converter. + information specific to a Faces Converter.

]]> @@ -590,7 +589,7 @@ or <handler-class> among its child elements.

Within a tag element, the validator element encapsulates - information specific to a Jakarta Server Faces Validator. + information specific to a Faces Validator.

]]> diff --git a/jakartaee9/src/web-fragment_5_0.xsds b/jakartaee9/src/web-fragment_5_0.xsds index 98823ec..8bd9246 100644 --- a/jakartaee9/src/web-fragment_5_0.xsds +++ b/jakartaee9/src/web-fragment_5_0.xsds @@ -35,7 +35,7 @@ - The ejb-local-ref-name element contains the name of an Jakarta - Enterprise Beans reference. The Jakarta Enterprise Beans reference + The ejb-local-ref-name element contains the name of an + enterprise bean reference. The enterprise bean reference is an entry in the web application's environment and is relative to the java:comp/env context. The name must be unique within the web application. @@ -145,8 +145,8 @@ - The ejb-ref-name element contains the name of an Jakarta - Enterprise Beans reference. The Jakarta Enterprise Beans reference + The ejb-ref-name element contains the name of an + enterprise bean reference. The enterprise bean reference is an entry in the web application's environment and is relative to the java:comp/env context. The name must be unique within the web application.