diff --git a/spec/src/main/asciidoc/1_overview.adoc b/spec/src/main/asciidoc/1_overview.adoc index 11d9d39..b1d9e13 100644 --- a/spec/src/main/asciidoc/1_overview.adoc +++ b/spec/src/main/asciidoc/1_overview.adoc @@ -41,15 +41,15 @@ The change log for the current version is found in <>. The Jakarta EE Platform specification requires support for interceptors. The use of interceptors defined by means of -the `Interceptors` annotation is required to be supported for Enterprise -Jakarta Beans and Managed Bean components, including in the absence of CDI. +the `Interceptors` annotation is required to be supported for Jakarta Enterprise +Beans and Managed Bean components, including in the absence of CDI. When CDI is enabled, the use of interceptors defined both by means of interceptor binding annotations and by means of the `Interceptors` annotation is required to be supported for component classes that support injection, as described in the section “Annotations and Injection” of the Jakarta EE Platform specification [<>]. -Both the Enterprise Jakarta Beans and the CDI specifications +Both the Jakarta Enterprise Beans and the CDI specifications provide extensions to this specification. Other specifications may choose to do so in the future. Such specifications are referred to in this document as extension specifications. This document outlines diff --git a/spec/src/main/asciidoc/2_interceptor_programming_contract.adoc b/spec/src/main/asciidoc/2_interceptor_programming_contract.adoc index 98f7179..6f3b1da 100644 --- a/spec/src/main/asciidoc/2_interceptor_programming_contract.adoc +++ b/spec/src/main/asciidoc/2_interceptor_programming_contract.adoc @@ -111,7 +111,7 @@ deployment descriptor to specify the invocation order of interceptors or to override the order specified in metadata annotations. A deployment descriptor can optionally be used to define interceptors, to define default interceptors, or to associate interceptors with a target class. -For example, the Enterprise Jakarta Beans specification [<>] requires support for the +For example, the Jakarta Enterprise Beans specification [<>] requires support for the `ejb-jar.xml` deployment descriptor and the CDI specification [<>] requires support for the `beans.xml` deployment descriptor. @@ -538,7 +538,7 @@ _Note: Timeout methods are currently specific to Jakarta Enterprise Beans, although Timer Service functionality may be extended to other specifications in the future, and extension specifications may define events that may be interposed on by -around-timeout methods. The Timer Service, defined by the Jakarta Enterprise +around-timeout methods. The enterprise beans Timer Service, defined by the Jakarta Enterprise Beans specification [<>], is a container-provided service that allows the Bean Provider to register enterprise beans for timer callbacks according to a calendar-based schedule, at a specified time, diff --git a/spec/src/main/asciidoc/5_interceptor_ordering.adoc b/spec/src/main/asciidoc/5_interceptor_ordering.adoc index 62dbc8c..743a156 100644 --- a/spec/src/main/asciidoc/5_interceptor_ordering.adoc +++ b/spec/src/main/asciidoc/5_interceptor_ordering.adoc @@ -36,7 +36,7 @@ overridden. An extension specification may define alternative mechanisms (e.g., a deployment descriptor such as the CDI -beans.xml [<>] or the Enterprise Jakarta Beans _ejb-jar.xml_ +beans.xml [<>] or the Jakarta Enterprise Beans _ejb-jar.xml_ deployment descriptor [<>]) to enable and order interceptors, to override the order specified by means of annotations, or to disable interceptors.