javax.interceptor to jakarta.interceptor

Signed-off-by: alwin.joseph <alwin.joseph@oracle.com>

install/jakartaee/bin/sig-test-pkg-list.txt

@@ -87,7 +87,7 @@ javax.faces.view
 javax.faces.view.facelets
 javax.faces.webapp
 javax.inject
-javax.interceptor
+jakarta.interceptor
 javax.jms
 javax.json
 javax.json.spi

install/jakartaee/bin/sig-test-pkg-list_se9.txt

@@ -92,7 +92,7 @@ javax.faces.view
 javax.faces.view.facelets
 javax.faces.webapp
 javax.inject
-javax.interceptor
+jakarta.interceptor
 javax.jms
 javax.json
 javax.json.bind

internal/docs/ejb/EJBJavaDocAssertions.xml

@@ -2663,7 +2663,7 @@
 <assertion required="true" impl-spec="false" status="active" testable="true">
 <id>254</id>
 <description/>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>Interceptors</class-interface>
 <method name="value" return-type="java.lang.Class[]"/>
 </assertion>
@@ -2673,7 +2673,7 @@
                             Returns the context data associated with this invocation or  lifecycle callback.
                               If there is no context data, an  empty Map object will be returned.
                         </description>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>InvocationContext</class-interface>
 <method name="getContextData" return-type="java.util.Map"/>
 </assertion>
@@ -2683,7 +2683,7 @@
                             Returns the method of the bean class for which the interceptor  was invoked.
                               For AroundInvoke methods, this is the business  method on the bean class. For lifecycle callback methods,   returns null.
                         </description>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>InvocationContext</class-interface>
 <method name="getMethod" return-type="java.lang.reflect.Method"/>
 </assertion>
@@ -2693,7 +2693,7 @@
                             Returns the parameters that will be used to invoke  the business method.
                               If setParameters has been called,   getParameters() returns the values to which the parameters   have been set.
                         </description>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>InvocationContext</class-interface>
 <method name="getParameters" return-type="java.lang.Object[]"/>
 </assertion>
@@ -2702,7 +2702,7 @@
 <description>
                             Returns the target instance.
                         </description>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>InvocationContext</class-interface>
 <method name="getTarget" return-type="java.lang.Object"/>
 </assertion>
@@ -2712,14 +2712,14 @@
                             Proceed to the next entry in the interceptor chain.
                               The proceed method returns the result of the next  method invoked.  If the method returns void, proceed  returns null.
                         </description>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>InvocationContext</class-interface>
 <method name="proceed" return-type="java.lang.Object"/>
 </assertion>
 <assertion required="true" impl-spec="false" status="active" testable="true">
 <id>260</id>
 <description/>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>InvocationContext</class-interface>
 <method name="proceed" return-type="java.lang.Object">
 <throw>java.lang.Exception</throw>
@@ -2730,7 +2730,7 @@
 <description>
                             Sets the parameters that will be used to invoke the   business method.
                         </description>
-<package>javax.interceptor</package>
+<package>jakarta.interceptor</package>
 <class-interface>InvocationContext</class-interface>
 <method name="setParameters" return-type="void">
 <parameters>

src/com/sun/ts/tests/ejb30/assembly/common/AssemblyBean.java

@@ -23,7 +23,7 @@
 import com.sun.ts.tests.ejb30.common.helloejbjar.HelloRemoteIF;
 import jakarta.ejb.EJB;
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 @Stateless
 @Interceptors({ AssemblyInterceptor.class })

src/com/sun/ts/tests/ejb30/assembly/common/AssemblyInterceptor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,8 +23,8 @@
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 public class AssemblyInterceptor {
 

src/com/sun/ts/tests/ejb30/assembly/librarydirectory/custom/AssemblyBean.java

@@ -29,7 +29,7 @@
 import com.sun.ts.tests.ejb30.misc.getresource.common.GetResourceTest;
 import jakarta.ejb.EJB;
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 @Stateless
 @Interceptors({ AssemblyInterceptor.class })

src/com/sun/ts/tests/ejb30/assembly/librarydirectory/disable/AssemblyBean.java

@@ -26,7 +26,7 @@
 import com.sun.ts.tests.ejb30.assembly.common.AssemblyRemoteIF;
 import jakarta.ejb.EJBException;
 import jakarta.ejb.Stateless;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 /**
  * This bean is packaged into lib/shared.jar, but this library-directory is

src/com/sun/ts/tests/ejb30/bb/mdb/callback/listener/annotated/CallbackBean.java

@@ -31,7 +31,7 @@
 import jakarta.ejb.MessageDriven;
 import jakarta.ejb.ActivationConfigProperty;
 import javax.jms.MessageListener;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import javax.jms.Queue;
 import javax.jms.QueueConnectionFactory;
 

src/com/sun/ts/tests/ejb30/bb/mdb/callback/listener/annotated/MDBCallbackListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,8 +23,8 @@
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.interceptor.InvocationContext;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
 
 /**
  * A callback listerner for mdb beans. Callback methods may throw

src/com/sun/ts/tests/ejb30/bb/mdb/callback/listener/descriptor/CallbackBean.java

@@ -31,7 +31,7 @@
 import jakarta.ejb.MessageDriven;
 import jakarta.ejb.ActivationConfigProperty;
 import javax.jms.MessageListener;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import javax.jms.Queue;
 import javax.jms.QueueConnectionFactory;
 

src/com/sun/ts/tests/ejb30/bb/mdb/callback/listener/descriptor/MDBCallbackListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,7 +21,7 @@
 package com.sun.ts.tests.ejb30.bb.mdb.callback.listener.descriptor;
 
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.InvocationContext;
 
 /**
  * A callback listerner for mdb beans. Callback methods may throw

src/com/sun/ts/tests/ejb30/bb/mdb/customlistener/MDBean.java

@@ -26,7 +26,7 @@
 import com.sun.ts.tests.common.connector.util.TSMessageListenerInterface;
 import jakarta.ejb.MessageDriven;
 import jakarta.ejb.ActivationConfigProperty;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import javax.jms.Queue;
 import javax.jms.QueueConnectionFactory;
 import jakarta.ejb.TransactionAttribute;

src/com/sun/ts/tests/ejb30/bb/mdb/interceptor/listener/annotated/AroundInvokeBean.java

@@ -22,10 +22,10 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeBase;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeTestMDBImpl;
 import jakarta.ejb.MessageDrivenContext;

src/com/sun/ts/tests/ejb30/bb/mdb/interceptor/listener/descriptor/AroundInvokeBean.java

@@ -22,10 +22,10 @@
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeBase;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeTestMDBImpl;
 import jakarta.ejb.MessageDrivenContext;

src/com/sun/ts/tests/ejb30/bb/mdb/interceptor/method/annotated/AroundInvokeBean.java

@@ -24,8 +24,8 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeBase;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeTestMDBImpl;
 import jakarta.ejb.MessageDrivenContext;

src/com/sun/ts/tests/ejb30/bb/mdb/interceptor/method/descriptor/AroundInvokeBean.java

@@ -24,8 +24,8 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeBase;
 import com.sun.ts.tests.ejb30.common.interceptor.AroundInvokeTestMDBImpl;
 import jakarta.ejb.MessageDrivenContext;

src/com/sun/ts/tests/ejb30/bb/session/stateful/bm/allowed/AllowedBean.java

@@ -26,11 +26,11 @@
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import com.sun.ts.tests.ejb30.common.helper.TestFailedException;
 import java.util.Properties;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundInvoke;
 import javax.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.Local;
 import jakarta.ejb.Remote;
 import jakarta.ejb.Remove;

src/com/sun/ts/tests/ejb30/bb/session/stateful/bm/allowed/CallbackAllowedBean.java

@@ -27,7 +27,7 @@
 import java.util.Properties;
 import javax.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.Local;
 import javax.annotation.PostConstruct;
 import jakarta.ejb.Remote;

src/com/sun/ts/tests/ejb30/bb/session/stateful/bm/allowed/SessionContextAllowedBean.java

@@ -27,7 +27,7 @@
 import java.util.Properties;
 import javax.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.Local;
 import jakarta.ejb.Remote;
 import jakarta.ejb.Remove;

src/com/sun/ts/tests/ejb30/bb/session/stateful/callback/listener/annotated/Callback2Bean.java

@@ -25,7 +25,7 @@
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateful;
 import javax.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.Remove;
 
 import com.sun.ts.tests.ejb30.common.callback.Callback2IF;

src/com/sun/ts/tests/ejb30/bb/session/stateful/callback/listener/annotated/CallbackBean.java

@@ -25,7 +25,7 @@
 import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateful;
 import javax.annotation.Resource;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.Remove;
 //@todo
 //import jakarta.ejb.Init;

src/com/sun/ts/tests/ejb30/bb/session/stateful/callback/listener/annotated/StatefulCallbackListener.java

@@ -23,8 +23,8 @@
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.PostActivate;
 import jakarta.ejb.PrePassivate;
 

src/com/sun/ts/tests/ejb30/bb/session/stateful/callback/listener/annotated/StatefulCallbackListener2.java

@@ -23,8 +23,8 @@
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.PostActivate;
 import jakarta.ejb.PrePassivate;
 

src/com/sun/ts/tests/ejb30/bb/session/stateful/callback/listener/descriptor/CallbackBean.java

@@ -31,7 +31,7 @@
 
 import com.sun.ts.tests.ejb30.common.callback.CallbackIF;
 import com.sun.ts.tests.ejb30.common.callback.CallbackBeanBase;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 
 @Stateful(name = "CallbackBean")
 @Remote({ CallbackIF.class })

src/com/sun/ts/tests/ejb30/bb/session/stateful/callback/listener/descriptor/StatefulCallbackListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,8 +21,8 @@
 package com.sun.ts.tests.ejb30.bb.session.stateful.callback.listener.descriptor;
 
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 /**
  * A callback listerner for stateful session beans. It uses ejb* for method

src/com/sun/ts/tests/ejb30/bb/session/stateful/callback/listener/descriptor/StatefulCallbackListener2.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,8 +21,8 @@
 package com.sun.ts.tests.ejb30.bb.session.stateful.callback.listener.descriptor;
 
 import com.sun.ts.tests.ejb30.common.helper.TLogger;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.InvocationContext;
 
 /**
  * A callback listerner for stateful session beans. Two callback annotations are

src/com/sun/ts/tests/ejb30/bb/session/stateful/cm/allowed/AllowedBean.java

@@ -25,11 +25,11 @@
 import com.sun.ts.tests.ejb30.common.allowed.stateful.StatefulOperations;
 import com.sun.ts.tests.ejb30.common.allowed.stateful.TimerLocalIF;
 import java.util.Properties;
-import javax.interceptor.AroundInvoke;
+import jakarta.interceptor.AroundInvoke;
 import javax.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.Interceptors;
+import jakarta.interceptor.InvocationContext;
 import jakarta.ejb.Local;
 import jakarta.ejb.Remote;
 import jakarta.ejb.Remove;

src/com/sun/ts/tests/ejb30/bb/session/stateful/cm/allowed/CallbackAllowedBean.java

@@ -28,7 +28,7 @@
 import java.util.Properties;
 import javax.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.Local;
 import javax.annotation.PostConstruct;
 import jakarta.ejb.Remote;

src/com/sun/ts/tests/ejb30/bb/session/stateful/cm/allowed/SessionContextAllowedBean.java

@@ -28,7 +28,7 @@
 import java.util.Properties;
 import javax.annotation.Resource;
 import jakarta.ejb.EJB;
-import javax.interceptor.Interceptors;
+import jakarta.interceptor.Interceptors;
 import jakarta.ejb.Local;
 import jakarta.ejb.Remote;
 import jakarta.ejb.Remove;