Renamed 'Ordering Interceptors using the Priority Annotation' to 'Use…

… of the Priority Annotation in Ordering Interceptors' Moved 'Use of the Priority Annotation in Ordering Interceptors' under Section 'Interceptor Ordering Rules' Signed-off-by: thadumi <th.theodor.th@gmail.com>
jakartaee · Mar 29, 2020 · 275c788 · 275c788
1 parent a227848
commit 275c788
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/spec/src/main/asciidoc/chapters/interceptor_ordering/enabling_interceptors.adoc b/spec/src/main/asciidoc/chapters/interceptor_ordering/enabling_interceptors.adoc
@@ -16,30 +16,30 @@ eligible to be invoked.
 
 Interceptors declared using interceptor
 bindings are enabled using the Priority annotation (see Section
-<<ordering_interceptors_using_the_priority_annotation>>).
+<<use_of_the_priority_annotation_in_ordering_interceptors>>).
 The _Priority_ annotation also controls
-interceptor ordering (see Section <<interceptor_ordering_rules>>).
+interceptor ordering (see Section 5.2 <<interceptor_ordering_rules>>).
 
 Interceptors declared using the
 _Interceptors_ annotation are enabled by that annotation. Using the
 _Interceptors_ annotation to associate interceptor classes with a target
 class or a method or constructor of a target class enables them for that
 target class, method, or constructor. The order in which the interceptor
 classes are specified in the _Interceptors_ annotation controls
-interceptor ordering (see Section <<interceptor_ordering_rules>>).
+interceptor ordering (see Section 5.2 <<interceptor_ordering_rules>>).
 Interceptor methods declared in the target
 class or in a superclass of the target class are enabled unless
 overridden.
 
 An extension specification may define
 alternative mechanisms (e.g., a deployment descriptor such as the CDI
-beans.xml <<bib3>> or the EJB _ejb-jar.xml_
-deployment descriptor <<bib2>>) to
+beans.xml [<<bib3>>] or the EJB _ejb-jar.xml_
+deployment descriptor [<<bib2>>]) to
 enable and order interceptors, to override the order specified by means
 of annotations, or to disable interceptors.
 
 _Note: The InvocationContext object allows
 interceptor methods to control the behavior of the invocation chain,
 including whether the next method in the chain is invoked and the values
-of its parameters and result. See Section
+of its parameters and result. See Section 2.4
 <<invocation_context>>._
diff --git a/spec/src/main/asciidoc/chapters/interceptor_ordering/interceptor_ordering.adoc b/spec/src/main/asciidoc/chapters/interceptor_ordering/interceptor_ordering.adoc
@@ -13,8 +13,6 @@
 
 include::enabling_interceptors.adoc[]
 
-include::interceptor_ordering_rules.adoc[]
-
-include::ordering_interceptors_using_the_priority_annotation.adoc[]
+include::interceptor_ordering_rules /interceptor_ordering_rules.adoc[]
 
 include::excluding_interceptors.adoc[]
diff --git a/..._ordering/interceptor_ordering_rules.adoc → ...ng_rules /interceptor_ordering_rules.adoc b/..._ordering/interceptor_ordering_rules.adoc → ...ng_rules /interceptor_ordering_rules.adoc
@@ -73,7 +73,7 @@ _Inherited_ annotation) are combined with all binding annotations on the
 target method and sorted by the priorities specified by the _Priority_
 annotation; and then the interceptor methods are invoked in order of
 priority. The _Priority_ annotation is described in Section
-<<ordering_interceptors_using_the_priority_annotation>>.
+<<use_of_the_priority_annotation_in_ordering_interceptors>>.
 
 - If an interceptor class declared using
 interceptor bindings has superclasses, interceptor methods declared in
@@ -93,3 +93,4 @@ itself, most general superclass first.
 another method (regardless whether that method is itself an interceptor
 method), it will not be invoked.
 
+include::use_of_the_priority_annotation_in_ordering_interceptors.adoc[]
diff --git a/...eptors_using_the_priority_annotation.adoc → ..._annotation_in_ordering_interceptors.adoc b/...eptors_using_the_priority_annotation.adoc → ..._annotation_in_ordering_interceptors.adoc
@@ -8,8 +8,8 @@
 *******************************************************************
 ////
 
-[[ordering_interceptors_using_the_priority_annotation]]
-=== Ordering Interceptors using the Priority Annotation
+[[use_of_the_priority_annotation_in_ordering_interceptors]]
+=== Use of the Priority Annotation in Ordering Interceptors
 
 The _Priority_ annotation can be used to
 enable and order interceptors associated with components that use