Merge pull request #52 from scottmarlow/switch2JakartaNamespace

javax.interceptor to jakarta.interceptor

api/pom.xml

@@ -28,7 +28,7 @@
 
     <groupId>jakarta.interceptor</groupId>
     <artifactId>jakarta.interceptor-api</artifactId>
-    <version>1.2.6-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
 
     <name>Jakarta Interceptors</name>
     <description>
@@ -40,8 +40,8 @@
 
     <properties>
         <non.final>false</non.final>
-        <extension.name>javax.interceptor</extension.name>
-        <spec.version>1.2</spec.version>
+        <extension.name>jakarta.interceptor</extension.name>
+        <spec.version>2.0</spec.version>
         <findbugs.version>3.0.1</findbugs.version>
         <findbugs.exclude>exclude.xml</findbugs.exclude>
         <findbugs.threshold>Low</findbugs.threshold>
@@ -256,7 +256,7 @@ Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">
                                 <group>
                                     <title>Jakarta Interceptors API Documentation</title>
                                     <packages>
-                                        javax.interceptor
+                                        jakarta.interceptor
                                     </packages>
                                 </group>
                             </groups>

api/src/main/java/javax/interceptor/AroundConstruct.java → api/src/main/java/jakarta/interceptor/AroundConstruct.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -51,7 +51,7 @@
  * <p>
  * The target instance is created and its constructor injection is performed, if applicable, when the last interceptor
  * method in the <code>AroundConstruct</code> interceptor chain invokes the
- * {@link javax.interceptor.InvocationContext#proceed()} method.
+ * {@link InvocationContext#proceed()} method.
  *
  * <p>
  * An <code>AroundConstruct</code> interceptor method should exercise caution accessing the instance whose constructor it

api/src/main/java/javax/interceptor/AroundInvoke.java → api/src/main/java/jakarta/interceptor/AroundInvoke.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -24,7 +24,7 @@
 
 /**
  * Defines an interceptor method that interposes on business methods. The method must take a single parameter of type
- * {@link javax.interceptor.InvocationContext} and have a return type {@link java.lang.Object}. The method must not be
+ * {@link InvocationContext} and have a return type {@link java.lang.Object}. The method must not be
  * declared as abstract, final, or static.
  *
  * <pre>
@@ -53,7 +53,7 @@
  * <p>
  * <code>AroundInvoke</code> methods may throw any exceptions that are allowed by the throws clause of the method on which
  * they are interposing. They may catch and suppress exceptions and recover by calling
- * {@link javax.interceptor.InvocationContext#proceed()}.
+ * {@link InvocationContext#proceed()}.
  * </p>
  *
  * @since Jakarta Interceptors 1.0

api/src/main/java/javax/interceptor/AroundTimeout.java → api/src/main/java/jakarta/interceptor/AroundTimeout.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -24,7 +24,7 @@
 
 /**
  * Defines an interceptor method that interposes on timeout methods. The method must take a single parameter of type
- * {@link javax.interceptor.InvocationContext} and have a return type {@link java.lang.Object}. The method must not be
+ * {@link InvocationContext} and have a return type {@link java.lang.Object}. The method must not be
  * declared as abstract, final, or static.
  *
  * <pre>
@@ -47,7 +47,7 @@
  * </p>
  *
  * <p>
- * {@link javax.interceptor.InvocationContext#getTimer()} allows any <code>AroundTimeout</code> method to retrieve the timer
+ * {@link InvocationContext#getTimer()} allows any <code>AroundTimeout</code> method to retrieve the timer
  * object associated with the timeout.
  * </p>
  *
@@ -59,7 +59,7 @@
  * <p>
  * <code>AroundTimeout</code> methods may throw any exceptions that are allowed by the throws clause of the timeout method
  * on which they are interposing. They may catch and suppress exceptions and recover by calling
- * {@link javax.interceptor.InvocationContext#proceed()}.
+ * {@link InvocationContext#proceed()}.
  * </p>
  *
  * @since Jakarta Interceptors 1.1

api/src/main/java/javax/interceptor/ExcludeClassInterceptors.java → api/src/main/java/jakarta/interceptor/ExcludeClassInterceptors.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.METHOD;
@@ -28,7 +28,7 @@
  * constructor to which it is applied.
  *
  * <p>
- * Excludes interceptors defined by means of the {@link javax.interceptor.Interceptors} annotation. Use of this
+ * Excludes interceptors defined by means of the {@link Interceptors} annotation. Use of this
  * annotation to exclude interceptors defined by means of interceptor binding annotations is not portable.
  * </p>
  *
@@ -37,7 +37,7 @@
  * public void updateOrder(Order order) { ... }
  * </pre>
  *
- * @see javax.interceptor.ExcludeDefaultInterceptors
+ * @see ExcludeDefaultInterceptors
  *
  * @since Jakarta Interceptors 1.0
  */

api/src/main/java/javax/interceptor/ExcludeDefaultInterceptors.java → api/src/main/java/jakarta/interceptor/ExcludeDefaultInterceptors.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.METHOD;

api/src/main/java/javax/interceptor/Interceptor.java → api/src/main/java/jakarta/interceptor/Interceptor.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -33,11 +33,11 @@
  *
  * <p>
  * Use of this annotation is required when declaring an interceptor using interceptor binding annotations. It is ignored
- * during the processing of classes bound using the {@link javax.interceptor.Interceptors Interceptors} annotation (or
+ * during the processing of classes bound using the {@link Interceptors Interceptors} annotation (or
  * when the Jakarta Enterprise Beans deployment descriptor is used to associate the interceptor with the target class).
  * </p>
  *
- * @see javax.interceptor.Interceptors
+ * @see Interceptors
  *
  * @since Jakarta Interceptors 1.1
  */
@@ -93,7 +93,7 @@
      * </pre>
      *
      * The {@link javax.annotation.Priority Priority} annotation is ignored when computing the invocation order of
-     * interceptors bound to a target using the {@link javax.interceptor.Interceptors Interceptors} annotation.
+     * interceptors bound to a target using the {@link Interceptors Interceptors} annotation.
      *
      * @see javax.annotation.Priority
      * 

api/src/main/java/javax/interceptor/InterceptorBinding.java → api/src/main/java/jakarta/interceptor/InterceptorBinding.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
@@ -41,7 +41,7 @@
  *
  * <p>
  * The interceptor bindings of an interceptor are specified by annotating the interceptor class with the binding types
- * and the {@link javax.interceptor.Interceptor Interceptor} annotation.
+ * and the {@link Interceptor Interceptor} annotation.
  * </p>
  *
  * <pre>
@@ -96,7 +96,7 @@
  * by all beans and other interceptor binding types that declare that interceptor binding type.
  * </p>
  *
- * @see javax.interceptor.Interceptor
+ * @see Interceptor
  *
  * @since Jakarta Interceptors 1.1
  */

api/src/main/java/javax/interceptor/Interceptors.java → api/src/main/java/jakarta/interceptor/Interceptors.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import static java.lang.annotation.ElementType.CONSTRUCTOR;
 import static java.lang.annotation.ElementType.METHOD;
@@ -46,8 +46,8 @@
  * Constructor interception may be specified by a constructor-level <code>Interceptors</code> declaration.
  * </p>
  *
- * @see javax.interceptor.ExcludeClassInterceptors
- * @see javax.interceptor.ExcludeDefaultInterceptors
+ * @see ExcludeClassInterceptors
+ * @see ExcludeDefaultInterceptors
  *
  * @since Jakarta Interceptors 1.0
  */

api/src/main/java/javax/interceptor/InvocationContext.java → api/src/main/java/jakarta/interceptor/InvocationContext.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.interceptor;
+package jakarta.interceptor;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;