Jakarta EJB namespace transition

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>

appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java

diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java
index 16bf91b..13ba299 100644
--- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java
+++ b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java
@@ -182,7 +182,7 @@
                 "com.sun.jdo.api.persistence.enhancer.ByteCodeEnhancer," /* appserv-cmp */ +
                 "com.sun.enterprise.admin.servermgmt.DomainConfig," /* appserv-admin */ +
                 "com.sun.enterprise.deployment.client.DeploymentClientUtils," /* appserv-deployment-client */ +
-                "javax.ejb.EJB," /* javaee */ +
+                "jakarta.ejb.EJB," /* javaee */ +
                 "javax.security.auth.message.module.ServerAuthModule," /* jmac-api */ +
                 "com.sun.appserv.management.ext.logging.LogAnalyzer," /* appserv-ext */ + 
                 "com.sun.mail.iap.Argument," /* mail */ +

appserver/core/api-exporter-fragment/pom.xml

diff --git a/appserver/core/api-exporter-fragment/pom.xml b/appserver/core/api-exporter-fragment/pom.xml
index 25e3562..2ea1107 100755
--- a/appserver/core/api-exporter-fragment/pom.xml
+++ b/appserver/core/api-exporter-fragment/pom.xml
@@ -87,9 +87,9 @@
 javax.crypto.interfaces; \
 javax.crypto.spec; \
 javax.decorator; \
-javax.ejb; \
-javax.ejb.embeddable; \
-javax.ejb.spi; \
+jakarta.ejb; \
+jakarta.ejb.embeddable; \
+jakarta.ejb.spi; \
 javax.el; \
 javax.enterprise.concurrent; \
 javax.enterprise.context; \

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java

diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java
index 017e23c..3721f9e 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/ResourceEnvReferenceDescriptor.java
@@ -32,11 +32,11 @@
     private boolean isManagedBean = false;
     private ManagedBeanDescriptor managedBeanDesc;
 
-    private static final String SESSION_CTX_TYPE = "javax.ejb.SessionContext";
-    private static final String MDB_CTX_TYPE ="javax.ejb.MessageDrivenContext";
-    private static final String EJB_CTX_TYPE ="javax.ejb.EJBContext";
+    private static final String SESSION_CTX_TYPE = "jakarta.ejb.SessionContext";
+    private static final String MDB_CTX_TYPE ="jakarta.ejb.MessageDrivenContext";
+    private static final String EJB_CTX_TYPE ="jakarta.ejb.EJBContext";
     private static final String EJB_TIMER_SERVICE_TYPE
-        = "javax.ejb.TimerService";
+        = "jakarta.ejb.TimerService";
     private static final String VALIDATION_VALIDATOR ="jakarta.validation.Validator";
     private static final String VALIDATION_VALIDATOR_FACTORY ="jakarta.validation.ValidatorFactory";
 

appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java

diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java
index 6df7b66..e8726e8 100644
--- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java
+++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/introspection/EjbComponentAnnotationScanner.java
@@ -25,9 +25,9 @@
 
 /**
  * This class contains the following annotation type:
- * javax.ejb.Stateless
- * javax.ejb.Stateful
- * javax.ejb.MessageDriven
+ * jakarta.ejb.Stateless
+ * jakarta.ejb.Stateful
+ * jakarta.ejb.MessageDriven
  *
  * @author Qingqing Ouyang
  */

appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java

diff --git a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java
index d6c5101..556e788 100644
--- a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java
+++ b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/UnitTest.java
@@ -23,8 +23,8 @@
 import java.net.URL;
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/distributions/web/src/test/java/org/glassfish/distributions/test/ejb/SampleEjb.java

diff --git a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/ejb/SampleEjb.java b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/ejb/SampleEjb.java
index 9567916..a4f9f2a 100644
--- a/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/ejb/SampleEjb.java
+++ b/appserver/distributions/web/src/test/java/org/glassfish/distributions/test/ejb/SampleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.distributions.test.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Jerome Dochez

appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java

diff --git a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java
index 502de0f..ce51b44 100644
--- a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java
+++ b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HandleImpl.java
@@ -43,7 +43,7 @@
 	this.ejbObject = ejbObject;
     }
 
-    // This is the public API from javax.ejb.Handle
+    // This is the public API from jakarta.ejb.Handle
     public EJBObject getEJBObject() throws RemoteException
     {
 	return ejbObject;

appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java

diff --git a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java
index a1a9fec..ae17561 100644
--- a/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java
+++ b/appserver/ejb/ejb-client/src/main/java/com/sun/ejb/portable/HomeHandleImpl.java
@@ -42,7 +42,7 @@
 	this.ejbHome = ejbHome;
     }
 
-    // This is the public API from javax.ejb.HomeHandle
+    // This is the public API from jakarta.ejb.HomeHandle
     public EJBHome getEJBHome() throws RemoteException
     {
 	return ejbHome;

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java
index f918318..f99b215 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/Container.java
@@ -168,7 +168,7 @@
      * finder method, such as calling ejbStore on bean instances.
      * (See EJB 2.1, Section 10.5.3 ejbFind,ejbStore)
      *
-     * @exception javax.ejb.EJBException  Thrown if an error occurs
+     * @exception jakarta.ejb.EJBException  Thrown if an error occurs
      *          during the preSelect actions performed by the container.
      *          If thrown, the remaining select query steps should be 
      *          aborted and an EJBException should be propagated

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java
index 7f71c77..1976c20 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/EjbNamingReferenceManagerImpl.java
@@ -204,7 +204,7 @@
 
         Object returnObject = ejbInv.context;
 
-        if( contextType.equals("javax.ejb.TimerService") ) {
+        if( contextType.equals("jakarta.ejb.TimerService") ) {
             if (EJBTimerService.getEJBTimerService() == null ) {
                 throw new IllegalStateException("EJB Timer Service not " +
                                                 "available");

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Generator.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Generator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Generator.java
index 171aedd..df86b5d 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Generator.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Generator.java
@@ -128,8 +128,8 @@
     }
 
     /**
-     * Return true if method is on a javax.ejb.EJBObject/EJBLocalObject/
-     * javax.ejb.EJBHome,javax.ejb.EJBLocalHome interface.
+     * Return true if method is on a jakarta.ejb.EJBObject/EJBLocalObject/
+     * jakarta.ejb.EJBHome,jakarta.ejb.EJBLocalHome interface.
      */
     protected boolean isEJBIntfMethod(Class ejbIntfClz, Method methodToCheck) {
         boolean isEJBIntfMethod = false;

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Remote30WrapperGenerator.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Remote30WrapperGenerator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Remote30WrapperGenerator.java
index 66cc88c..89b382d 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Remote30WrapperGenerator.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/Remote30WrapperGenerator.java
@@ -84,7 +84,7 @@
         if( jakarta.ejb.EJBObject.class.isAssignableFrom(businessInterface) ) {
             throw new GeneratorException("Invalid Remote Business Interface " +
                  businessInterface + ". A Remote Business interface MUST " +
-                 "not extend javax.ejb.EJBObject.");
+                 "not extend jakarta.ejb.EJBObject.");
         }
 
         remoteClientClassName = EJBUtils.
@@ -201,7 +201,7 @@
                     "trex");
 
                 _define( _t("java.lang.RuntimeException"), "r", 
-                         _new( _t("javax.ejb.EJBTransactionRolledbackException"), 
+                         _new( _t("jakarta.ejb.EJBTransactionRolledbackException"), 
                            _s(_void())));
                 _expr( _call( _v("r"), "initCause",
                               _s(_t("java.lang.Throwable"), 
@@ -213,7 +213,7 @@
                     "treqex");
 
                 _define( _t("java.lang.RuntimeException"), "r", 
-                         _new( _t("javax.ejb.EJBTransactionRequiredException"), 
+                         _new( _t("jakarta.ejb.EJBTransactionRequiredException"), 
                            _s(_void())));
                 _expr( _call( _v("r"), "initCause",
                               _s(_t("java.lang.Throwable"), 
@@ -225,7 +225,7 @@
                     "nsoe");
 
                 _define( _t("java.lang.RuntimeException"), "r", 
-                         _new( _t("javax.ejb.NoSuchEJBException"), 
+                         _new( _t("jakarta.ejb.NoSuchEJBException"), 
                            _s(_void())));
                 _expr( _call( _v("r"), "initCause",
                               _s(_t("java.lang.Throwable"), 
@@ -237,7 +237,7 @@
                     "accex");
 
                 _define( _t("java.lang.RuntimeException"), "r",
-                         _new( _t("javax.ejb.EJBAccessException"),
+                         _new( _t("jakarta.ejb.EJBAccessException"),
                            _s(_void())));
                 _expr( _call( _v("r"), "initCause",
                               _s(_t("java.lang.Throwable"),
@@ -253,21 +253,21 @@
                 //_define( _t("java.lang.Throwable"), "r", _null());
 
                          
-                // _throw(_cast(_t("javax.ejb.EJBException"), _v("r")));
-                _throw(_cast(_t("javax.ejb.EJBException"),
+                // _throw(_cast(_t("jakarta.ejb.EJBException"), _v("r")));
+                _throw(_cast(_t("jakarta.ejb.EJBException"),
                             _call( _v("iejbcEx"), "getCause",
                               _s(_t("java.lang.Throwable")))));
 
 
             _catch( _t("java.rmi.RemoteException"), "re");
             
-                _throw( _new( _t("javax.ejb.EJBException"), 
+                _throw( _new( _t("jakarta.ejb.EJBException"), 
                               _s(_void(), _t("java.lang.Exception")), 
                               _v("re")));
             
             _catch( _t("org.omg.CORBA.SystemException"), "corbaSysEx");
                 _define( _t("java.lang.RuntimeException"), "r", 
-                         _new( _t("javax.ejb.EJBException"), 
+                         _new( _t("jakarta.ejb.EJBException"), 
                            _s(_void())));
                 _expr( _call( _v("r"), "initCause",
                               _s(_t("java.lang.Throwable"), 

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java
index 586b906..10f5a1b 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/codegen/StaticRmiStubGenerator.java
@@ -360,8 +360,8 @@
             String intfName = (String) iter.next();
             Class  intfClass = jcl.loadClass(intfName);
             if ( java.rmi.Remote.class.isAssignableFrom(intfClass) &&
-                 !(intfName.equals("javax.ejb.EJBHome")) &&
-                 !(intfName.equals("javax.ejb.EJBObject")) ) {
+                 !(intfName.equals("jakarta.ejb.EJBHome")) &&
+                 !(intfName.equals("jakarta.ejb.EJBObject")) ) {
                 remoteSuperInterfaces.add(intfName);
             }
         }

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java
index e3827cd..64a9b34 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/BaseContainer.java
@@ -2255,7 +2255,7 @@
         } else {
             throw new EJBException(localStrings.getLocalString(
                 "ejb.invalid_timeout_method",
-                "Invalid @Timeout or @Schedule signature for: {0} @Timeout or @Schedule method must return void and be a no-arg method or take a single javax.ejb.Timer param",
+                "Invalid @Timeout or @Schedule signature for: {0} @Timeout or @Schedule method must return void and be a no-arg method or take a single jakarta.ejb.Timer param",
                 method));
         }
     }
@@ -2412,7 +2412,7 @@
 
     /**
      * Create an array of all methods in the standard EJB interfaces:
-     * javax.ejb.EJB(Local){Home|Object} .
+     * jakarta.ejb.EJB(Local){Home|Object} .
      */
     private void initializeEjbInterfaceMethods()
         throws Exception
@@ -2863,7 +2863,7 @@
         
         // All methods on the Home/LocalHome & super-interfaces
         // are not business methods.
-        // All methods on javax.ejb.EJBObject and EJBLocalObject
+        // All methods on jakarta.ejb.EJBObject and EJBLocalObject
         // (e.g. remove) are not business methods.
         // All remaining methods are business methods
         
@@ -3674,7 +3674,7 @@
             handler.setProxy(ejbHomeProxy);
         } catch (ClassCastException e) {
             String msg = localStrings.getLocalString("ejb.basecontainer_invalid_home_interface",
-                    "Home interface [{0}] is invalid since it does not extend javax.ejb.EJBHome.", homeIntf);
+                    "Home interface [{0}] is invalid since it does not extend jakarta.ejb.EJBHome.", homeIntf);
             throw new IllegalArgumentException(msg, e);
         }
 
@@ -3741,7 +3741,7 @@
             invHandler.setProxy(proxy);
         } catch (ClassCastException e) {
             String msg = localStrings.getLocalString("ejb.basecontainer_invalid_local_home_interface",
-                    "Local home interface [{0}] is invalid since it does not extend javax.ejb.EJBLocalHome.", localHomeIntf);
+                    "Local home interface [{0}] is invalid since it does not extend jakarta.ejb.EJBLocalHome.", localHomeIntf);
             throw new IllegalArgumentException(msg, e);
         }
 
@@ -3806,7 +3806,7 @@
             handler.setProxy(localObjectProxy);
         } catch (ClassCastException e) {
             String msg = localStrings.getLocalString("ejb.basecontainer_invalid_local_interface",
-                    "Local component interface [{0}] is invalid since it does not extend javax.ejb.EJBLocalObject.", localIntf);
+                    "Local component interface [{0}] is invalid since it does not extend jakarta.ejb.EJBLocalObject.", localIntf);
             throw new IllegalArgumentException(msg, e);
         }
 
@@ -3895,7 +3895,7 @@
             handler.setEJBObject(ejbObjectProxy);
         } catch (ClassCastException e) {
             String msg = localStrings.getLocalString("ejb.basecontainer_invalid_remote_interface", 
-                "Remote component interface [{0}] is invalid since it does not extend javax.ejb.EJBObject.", remoteIntf);
+                "Remote component interface [{0}] is invalid since it does not extend jakarta.ejb.EJBObject.", remoteIntf);
             throw new IllegalArgumentException(msg, e);
         }
 

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContextImpl.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContextImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContextImpl.java
index 39a1c92..0a8472b 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContextImpl.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBContextImpl.java
@@ -40,7 +40,7 @@
 import java.util.logging.Logger;
 
 /**
- * Implementation of javax.ejb.EJBContext for the J2EE Reference Implementation.
+ * Implementation of jakarta.ejb.EJBContext for the J2EE Reference Implementation.
  *
  */
 

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java
index 7a6d790..7df5dba 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBHomeImpl.java
@@ -100,11 +100,11 @@
     
     /***************************************
 ***********************************
-    The following are implementations of javax.ejb.EJBHome methods.
+    The following are implementations of jakarta.ejb.EJBHome methods.
      **************************************************************************/
     
     /**
-     * This is the implementation of the javax.ejb.EJBHome remove method.
+     * This is the implementation of the jakarta.ejb.EJBHome remove method.
      * @exception RemoveException on error during removal
      */
     public final void remove(Handle handle)
@@ -127,7 +127,7 @@
     
     
     /**
-     * This is the implementation of the javax.ejb.EJBHome remove method.
+     * This is the implementation of the jakarta.ejb.EJBHome remove method.
      * @exception RemoveException on error during removal
      */
     public final void remove(Object primaryKey)
@@ -153,7 +153,7 @@
     
     
     /**
-     * This is the implementation of the javax.ejb.EJBHome method.
+     * This is the implementation of the jakarta.ejb.EJBHome method.
      */
     public final EJBMetaData getEJBMetaData()
         throws RemoteException
@@ -164,7 +164,7 @@
     }
     
     /**
-     * This is the implementation of the javax.ejb.EJBHome getHomeHandle
+     * This is the implementation of the jakarta.ejb.EJBHome getHomeHandle
      * method.
      */
     public final HomeHandle getHomeHandle()

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeImpl.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeImpl.java
index 49790e6..67fdfcc 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeImpl.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeImpl.java
@@ -93,7 +93,7 @@
     }
     
     /**
-     * This is the implementation of the javax.ejb.EJBLocalHome remove method.
+     * This is the implementation of the jakarta.ejb.EJBLocalHome remove method.
      */
     public final void remove(Object primaryKey)
         throws RemoveException, EJBException

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeInvocationHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeInvocationHandler.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeInvocationHandler.java
index fe8c154..2d723a4 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeInvocationHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalHomeInvocationHandler.java
@@ -137,7 +137,7 @@
 
         if( (methodClass == jakarta.ejb.EJBLocalHome.class) ||
             invInfo.ejbIntfOverride ) {
-            // There is only one method on javax.ejb.EJBLocalHome
+            // There is only one method on jakarta.ejb.EJBLocalHome
             super.remove(args[0]);
             return null;
 

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java
index b77e2c8..d3d2b60 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java
@@ -176,7 +176,7 @@
     
     /**
      * This is called when the EJB client does ejbref.getHandle().
-     * Return a serializable implementation of javax.ejb.Handle.
+     * Return a serializable implementation of jakarta.ejb.Handle.
      */
     public final Handle getHandle() throws RemoteException {
         container.authorizeRemoteMethod(BaseContainer.EJBObject_getHandle);

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java
index 5f702ea..969dd12 100755
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerService.java
@@ -658,7 +658,7 @@
                 throw new CreateException
                         ("Attempt to create an EJB Timer from a bean that is " +
                          "not a Timed Object.  EJB class " + ejbClass + 
-                         " must implement javax.ejb.TimedObject or " +
+                         " must implement jakarta.ejb.TimedObject or " +
                          " annotation a timeout method with @Timeout");
             }
         }
@@ -925,7 +925,7 @@
     }
 
     //
-    // Logic used by TimerWrapper for javax.ejb.Timer methods.
+    // Logic used by TimerWrapper for jakarta.ejb.Timer methods.
     //
 
     protected void cancelTimer(TimerPrimaryKey timerId) 

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java
index 353b744..a14b5a8 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBTimerServiceWrapper.java
@@ -234,7 +234,7 @@
         } else {
             throw new IllegalStateException("EJBTimerService.createTimer can "
                 + "only be called from a timed object.  This EJB does not " 
-                + "implement javax.ejb.TimedObject");                 
+                + "implement jakarta.ejb.TimedObject");                 
         }
     }
 

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java
index a9ea1ad..4577a3f 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java
@@ -1171,8 +1171,8 @@
         ejbInv.method = removeMethod;
 
         // Method must be a remove method defined on one of :
-        // javax.ejb.EJBHome, javax.ejb.EJBObject, javax.ejb.EJBLocalHome,
-        // javax.ejb.EJBLocalObject
+        // jakarta.ejb.EJBHome, jakarta.ejb.EJBObject, jakarta.ejb.EJBLocalHome,
+        // jakarta.ejb.EJBLocalObject
         Class declaringClass = removeMethod.getDeclaringClass();
         ejbInv.isHome = ((declaringClass == jakarta.ejb.EJBHome.class) ||
                 (declaringClass == jakarta.ejb.EJBLocalHome.class));

appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java

diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java
index 3936751..0db34ff 100644
--- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java
+++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/TimerWrapper.java
@@ -55,7 +55,7 @@
     }
 
     /*
-     * Implementations of javax.ejb.Timer methods
+     * Implementations of jakarta.ejb.Timer methods
      */
     public void cancel() 
         throws IllegalStateException, NoSuchObjectLocalException, EJBException {

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractEjbHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractEjbHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractEjbHandler.java
index cc97647..c5bf76f 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractEjbHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AbstractEjbHandler.java
@@ -302,7 +302,7 @@
             // be ejbTimeout.
             timeoutMethodDesc = new MethodDescriptor
                 ("ejbTimeout", "@Timeout method", 
-                 new String[] { "javax.ejb.Timer" }, 
+                 new String[] { "jakarta.ejb.Timer" }, 
                  MethodDescriptor.TIMER_METHOD);
         }
 
@@ -574,7 +574,7 @@
         return ( (intf == java.io.Serializable.class) ||
                  (intf == java.io.Externalizable.class) ||
                  ( (intf.getPackage() != null) &&
-                   intf.getPackage().getName().equals("javax.ejb")) );
+                   intf.getPackage().getName().equals("jakarta.ejb")) );
     }
 
     protected void doDescriptionProcessing(String description,

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java
index 8982fb8..a4c710e 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AccessTimeoutHandler.java
@@ -39,7 +39,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.AccessTimeout.
+ * This handler is responsible for handling the jakarta.ejb.AccessTimeout.
  *
  * @author Mahesh Kannan
  * @author Marina Vatkina

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java
index bed6d16..d742cbf 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterBeginHandler.java
@@ -32,7 +32,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.AfterBegin
+ * This handler is responsible for handling the jakarta.ejb.AfterBegin
  * annotation on a Bean method.
  *
  * @author Marina Vatkina

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java
index 11684e0..9c5fd9f 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AfterCompletionHandler.java
@@ -32,7 +32,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.AfterCompletion
+ * This handler is responsible for handling the jakarta.ejb.AfterCompletion
  * annotation on a Bean method.
  *
  * @author Marina Vatkina

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ApplicationExceptionHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ApplicationExceptionHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ApplicationExceptionHandler.java
index 13aa7d8..a9a10d3 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ApplicationExceptionHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ApplicationExceptionHandler.java
@@ -32,7 +32,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * Handles @javax.ejb.ApplicationException 
+ * Handles @jakarta.ejb.ApplicationException 
  */
 @Service
 @AnnotationHandlerFor(ApplicationException.class)

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java
index 0120961..ebdd419 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundInvokeHandler.java
@@ -32,7 +32,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.AroundInvoke attribute
+ * This handler is responsible for handling the jakarta.ejb.AroundInvoke attribute
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java
index cb6834f..d6e67f2 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AroundTimeoutHandler.java
@@ -29,7 +29,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.AroundTimeout attribute
+ * This handler is responsible for handling the jakarta.ejb.AroundTimeout attribute
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java
index 703a59b..234fecc 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/AsynchronousHandler.java
@@ -39,7 +39,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Asynchronous
+ * This handler is responsible for handling the jakarta.ejb.Asynchronous
  * annotation on the Bean class.
  *
  * @author Marina Vatkina

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java
index a6a6443..503aec2 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/BeforeCompletionHandler.java
@@ -32,7 +32,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.BeforeCompletion
+ * This handler is responsible for handling the jakarta.ejb.BeforeCompletion
  * annotation on a Bean method.
  *
  * @author Marina Vatkina

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java
index 49b76e1..5cd9068 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ConcurrencyManagementHandler.java
@@ -30,7 +30,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.ConcurrencyManagement.
+ * This handler is responsible for handling the jakarta.ejb.ConcurrencyManagement.
  *
  * @author Kenneth Saks
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java
index 0858160..3fcd357 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBHandler.java
@@ -42,7 +42,7 @@
 import static com.sun.enterprise.util.StringUtils.ok;
 
 /**
- * This handler is responsible for handling the javax.ejb.EJB
+ * This handler is responsible for handling the jakarta.ejb.EJB
  *
  * @author Shing Wai Chan
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBsHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBsHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBsHandler.java
index 98c704f..eb1c15e 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBsHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/EJBsHandler.java
@@ -30,7 +30,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.EJBs attribute
+ * This handler is responsible for handling the jakarta.ejb.EJBs attribute
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java
index fc568ce..6adca04 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/InitHandler.java
@@ -33,7 +33,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Init attribute
+ * This handler is responsible for handling the jakarta.ejb.Init attribute
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/LockHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/LockHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/LockHandler.java
index a7e146b..f5a0f9d 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/LockHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/LockHandler.java
@@ -39,7 +39,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Lock.
+ * This handler is responsible for handling the jakarta.ejb.Lock.
  *
  * @author Mahesh Kannan
  * @author Marina Vatkina

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java
index b6b8c65..d226525 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PostActivateHandler.java
@@ -32,7 +32,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling javax.ejb.PostActivate 
+ * This handler is responsible for handling jakarta.ejb.PostActivate 
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java
index fc72ac6..adf334f 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/PrePassivateHandler.java
@@ -32,7 +32,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling javax.ejb.PrePassivate 
+ * This handler is responsible for handling jakarta.ejb.PrePassivate 
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java
index 773d7d8..f21e5f6 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/RemoveHandler.java
@@ -31,7 +31,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Remove attribute
+ * This handler is responsible for handling the jakarta.ejb.Remove attribute
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java
index fa6b8e3..75e8b19 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/ScheduleHandler.java
@@ -36,7 +36,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Schedule
+ * This handler is responsible for handling the jakarta.ejb.Schedule
  * annotation on methods of a Bean class. 
  *
  * @author Marina Vatkina

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java
index f9f33ad..ecd8638 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SchedulesHandler.java
@@ -29,7 +29,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Schedules attribute
+ * This handler is responsible for handling the jakarta.ejb.Schedules attribute
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java
index 5bfc4bc..b88073a 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/SingletonHandler.java
@@ -32,7 +32,7 @@
 
 
 /**
- * This handler is responsible for handling the javax.ejb.Singleton
+ * This handler is responsible for handling the jakarta.ejb.Singleton
  *
  * @author Shing Wai Chan
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java
index db56782..bc93cd5 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulHandler.java
@@ -29,7 +29,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Stateful
+ * This handler is responsible for handling the jakarta.ejb.Stateful
  *
  * @author Shing Wai Chan
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java
index 9ad4f19..11bdfe3 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatefulTimeoutHandler.java
@@ -29,7 +29,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.ConcurrencyManagement.
+ * This handler is responsible for handling the jakarta.ejb.ConcurrencyManagement.
  *
  * @author Ken Saks
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java
index 1f86ad2..d0c6b30 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/StatelessHandler.java
@@ -29,7 +29,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Stateless
+ * This handler is responsible for handling the jakarta.ejb.Stateless
  *
  * @author Shing Wai Chan
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java
index 7e1e395..ad87466 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TimeoutHandler.java
@@ -27,7 +27,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.Timeout attribute
+ * This handler is responsible for handling the jakarta.ejb.Timeout attribute
  *
  */
 @Service

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionAttributeHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionAttributeHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionAttributeHandler.java
index ba5d246..a89c1dd 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionAttributeHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionAttributeHandler.java
@@ -47,7 +47,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.TransactionAttribute.
+ * This handler is responsible for handling the jakarta.ejb.TransactionAttribute.
  *
  * @author Shing Wai Chan
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java
index a133ae0..54ed24c 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/annotation/handlers/TransactionManagementHandler.java
@@ -29,7 +29,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.TransactionManagement.
+ * This handler is responsible for handling the jakarta.ejb.TransactionManagement.
  *
  * @author Shing Wai Chan
  */

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbSessionDescriptor.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbSessionDescriptor.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbSessionDescriptor.java
index 885c996..09df966 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbSessionDescriptor.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/descriptor/EjbSessionDescriptor.java
@@ -423,7 +423,7 @@
 
                 AnnotationTypesProvider provider = Globals.getDefaultHabitat().getService(AnnotationTypesProvider.class, "EJB");
                 if (provider!=null) {
-                    Class sessionSynchClass = provider.getType("javax.ejb.SessionSynchronization");
+                    Class sessionSynchClass = provider.getType("jakarta.ejb.SessionSynchronization");
                     if( sessionSynchClass.isAssignableFrom(ejbClass) ) {
                         txAttributes = new Vector();
                         txAttributes.add(new ContainerTransaction

appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/util/EjbBundleValidator.java

diff --git a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/util/EjbBundleValidator.java b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/util/EjbBundleValidator.java
index 7eeda29..67de010 100644
--- a/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/util/EjbBundleValidator.java
+++ b/appserver/ejb/ejb-container/src/main/java/org/glassfish/ejb/deployment/util/EjbBundleValidator.java
@@ -296,11 +296,11 @@
             }
 
             if( ejb.getEjbTimeoutMethod() == null && 
-                    provider.getType("javax.ejb.TimedObject").isAssignableFrom(ejbClass) ) {
+                    provider.getType("jakarta.ejb.TimedObject").isAssignableFrom(ejbClass) ) {
                 MethodDescriptor timedObjectMethod =
                         new MethodDescriptor("ejbTimeout",
                                                  "TimedObject timeout method",
-                                                 new String[] {"javax.ejb.Timer"},
+                                                 new String[] {"jakarta.ejb.Timer"},
                                                  MethodDescriptor.TIMER_METHOD);
                 ejb.setEjbTimeoutMethod(timedObjectMethod);
 
@@ -665,12 +665,12 @@
             Class ejbClass) throws ClassNotFoundException {
         Method m = timeoutMethodDescOrig.getDeclaredMethod(ejb);
         if (m == null) {
-           // In case deployment descriptor didn't specify "javax.ejb.Timer"
+           // In case deployment descriptor didn't specify "jakarta.ejb.Timer"
            // as the method-params, and we were not relying on it before,
-           // check explicitly for a method with "javax.ejb.Timer" param type.
+           // check explicitly for a method with "jakarta.ejb.Timer" param type.
             Class[] params = new Class[1];
             if (provider!=null) {
-                params[0] = provider.getType("javax.ejb.Timer");
+                params[0] = provider.getType("jakarta.ejb.Timer");
             } else {
                 throw new RuntimeException("Cannot find AnnotationTypesProvider named 'EJB'");
             }

appserver/ejb/ejb-container/src/main/resources/com/sun/ejb/containers/LocalStrings.properties

diff --git a/appserver/ejb/ejb-container/src/main/resources/com/sun/ejb/containers/LocalStrings.properties b/appserver/ejb/ejb-container/src/main/resources/com/sun/ejb/containers/LocalStrings.properties
index 4fde544..7635036 100644
--- a/appserver/ejb/ejb-container/src/main/resources/com/sun/ejb/containers/LocalStrings.properties
+++ b/appserver/ejb/ejb-container/src/main/resources/com/sun/ejb/containers/LocalStrings.properties
@@ -32,10 +32,10 @@
 ejb.null_invocation_info=EjbInvocation Info lookup failed for method {0}
 ejb.client_not_authorized=Client not authorized for this invocation
 ejb.extended_persistence_context_not_supported=EntityManager with PersistenceContextType.EXTENDED is not supported for this bean type
-ejb.invalid_timeout_method=Invalid @Timeout or @Schedule signature for: {0} @Timeout or @Schedule method must return void and be a no-arg method or take a single javax.ejb.Timer param
+ejb.invalid_timeout_method=Invalid @Timeout or @Schedule signature for: {0} @Timeout or @Schedule method must return void and be a no-arg method or take a single jakarta.ejb.Timer param
 ejb.basecontainer_internal_error=Internal error: BaseContainer.{0} called
 ejb.entity_container_only={0} only works for EntityContainer
-ejb.basecontainer_invalid_remote_interface=Remote component interface [{0}] is invalid since it does not extend javax.ejb.EJBObject.
-ejb.basecontainer_invalid_local_interface=Local component interface [{0}] is invalid since it does not extend javax.ejb.EJBLocalObject.
-ejb.basecontainer_invalid_local_home_interface=Local home interface [{0}] is invalid since it does not extend javax.ejb.EJBLocalHome.
-ejb.basecontainer_invalid_home_interface=Home interface [{0}] is invalid since it does not extend javax.ejb.EJBHome.
+ejb.basecontainer_invalid_remote_interface=Remote component interface [{0}] is invalid since it does not extend jakarta.ejb.EJBObject.
+ejb.basecontainer_invalid_local_interface=Local component interface [{0}] is invalid since it does not extend jakarta.ejb.EJBLocalObject.
+ejb.basecontainer_invalid_local_home_interface=Local home interface [{0}] is invalid since it does not extend jakarta.ejb.EJBLocalHome.
+ejb.basecontainer_invalid_home_interface=Home interface [{0}] is invalid since it does not extend jakarta.ejb.EJBHome.

appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java

diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java
index 673ad89..5918396 100644
--- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java
+++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java
@@ -35,7 +35,7 @@
 import org.jvnet.hk2.annotations.Service;
 
 /**
- * This handler is responsible for handling the javax.ejb.MessageDriven
+ * This handler is responsible for handling the jakarta.ejb.MessageDriven
  *
  * @author Shing Wai Chan
  */

appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/PersistentEJBTimerService.java

diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/PersistentEJBTimerService.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/PersistentEJBTimerService.java
index 319f384..13044af 100755
--- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/PersistentEJBTimerService.java
+++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/PersistentEJBTimerService.java
@@ -938,7 +938,7 @@
     }
 
     //
-    // Logic used by TimerWrapper for javax.ejb.Timer methods.
+    // Logic used by TimerWrapper for jakarta.ejb.Timer methods.
     //
 
     @Override

appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java

diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java
index 058a421..bcc64d2 100644
--- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java
+++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/persistent/timer/TimerBean.java
@@ -291,7 +291,7 @@
         // Only proceed with transactional semantics if this timer
         // is owned by the current server instance.  NOTE that this
         // will *ALWAYS* be the case for timers created from EJB
-        // applications via the javax.ejb.EJBTimerService.create methods.  
+        // applications via the jakarta.ejb.EJBTimerService.create methods.  
         //
         // For testing purposes, ejbCreate takes an ownerId parameter, 
         // which allows us to easily simulate other server instances 

appserver/ejb/ejb-full-container/src/main/resources/org/glassfish/ejb/mdb/LogStrings.properties

diff --git a/appserver/ejb/ejb-full-container/src/main/resources/org/glassfish/ejb/mdb/LogStrings.properties b/appserver/ejb/ejb-full-container/src/main/resources/org/glassfish/ejb/mdb/LogStrings.properties
index c2f11b7..3dc4454 100644
--- a/appserver/ejb/ejb-full-container/src/main/resources/org/glassfish/ejb/mdb/LogStrings.properties
+++ b/appserver/ejb/ejb-full-container/src/main/resources/org/glassfish/ejb/mdb/LogStrings.properties
@@ -31,7 +31,7 @@
 containers.mdb.dest_notfound=MDB00015: [{0}]: Message-driven bean destination name [{1}] not found
 containers.mdb.name_notfound=MDB00016: [{0}]: Name not found exception: [{1}]
 containers.mdb.create_container_exception=MDB00017: [{0}]: Exception in creating message-driven bean container: [{1}]
-MDB00017.diag.cause.1=An error occurred during the message-driven bean container initialization at runtime.  The most common cause for this is that the physical resource(e.g. Queue) from which the message-driven bean is consuming either does not exist or has been configured incorrectly.  Another common error is that the message-driven bean implementation class does not correctly implement the required javax.ejb.MessageBean or MessageListener interfaces.
+MDB00017.diag.cause.1=An error occurred during the message-driven bean container initialization at runtime.  The most common cause for this is that the physical resource(e.g. Queue) from which the message-driven bean is consuming either does not exist or has been configured incorrectly.  Another common error is that the message-driven bean implementation class does not correctly implement the required jakarta.ejb.MessageBean or MessageListener interfaces.
 MDB00017.diag.check.1=Double-check that the JNDI name of the message-driven bean's resource in sun-ejb-jar.xml is correct.  It is also useful to run the verifier to check that the code requirements for the message-driven bean class have been fulfilled.
 containers.mdb.container_connection_closing=MDB00018: [{0}]: Closing message-driven bean container connection
 containers.mdb.container_connection_closed=MDB00019: [{0}]: Message-driven bean container connection closed

appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java

diff --git a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java
index 7733ff6..69d6a37 100644
--- a/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java
+++ b/appserver/persistence/cmp/model/src/main/java/com/sun/jdo/api/persistence/model/Model.java
@@ -112,7 +112,7 @@
 	static
 	{
 		String prefixes[] =
-			{"java.awt", "java.applet", "javax.swing", "javax.ejb"};// NOI18N
+			{"java.awt", "java.applet", "javax.swing", "jakarta.ejb"};// NOI18N
 		String classes[] = {"java.lang.Throwable"};					// NOI18N
 		String collectionClasses[] = { "java.util.Collection",		// NOI18N
 			"java.util.AbstractCollection", 						// NOI18N

appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java

diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java
index a1ac73d..82392f3 100644
--- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java
+++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplateFormatter.java
@@ -95,18 +95,18 @@
     public final static String ejbPostCreate_             = "ejbPostCreate"; // NOI18N
     public final static String ejbRemove_                 = "ejbRemove"; // NOI18N
     public final static String ejbLoad_                   = "ejbLoad"; // NOI18N
-    public final static String CreateException_           = "javax.ejb.CreateException"; // NOI18N
-    public final static String DuplicateKeyException_     = "javax.ejb.DuplicateKeyException"; // NOI18N
-    public final static String RemoveException_           = "javax.ejb.RemoveException"; // NOI18N
+    public final static String CreateException_           = "jakarta.ejb.CreateException"; // NOI18N
+    public final static String DuplicateKeyException_     = "jakarta.ejb.DuplicateKeyException"; // NOI18N
+    public final static String RemoveException_           = "jakarta.ejb.RemoveException"; // NOI18N
     public final static String ejbException_              = "EJBException"; // NOI18N
-    public final static String finderException_           = "javax.ejb.FinderException"; // NOI18N
+    public final static String finderException_           = "jakarta.ejb.FinderException"; // NOI18N
     public final static String assertInTransaction_       = "assertInTransaction"; // NOI18N
     public final static String assertPersistenceManagerIsNull_       
                                                           = "assertPersistenceManagerIsNull"; // NOI18N
     public final static String assertPersistenceManagerIsNullCall_       
                                                           = "assertPersistenceManagerIsNullCall"; // NOI18N
     public final static String setEntityContext_          = "setEntityContext"; // NOI18N
-    public final static String EntityContext_             = "javax.ejb.EntityContext"; // NOI18N
+    public final static String EntityContext_             = "jakarta.ejb.EntityContext"; // NOI18N
     public final static String castKey_                   = "castKey"; // NOI18N
     public final static String castOid_                   = "castOid"; // NOI18N
     public final static String getPK_                     = "getPK"; // NOI18N

appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplates.properties

diff --git a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplates.properties b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplates.properties
index a1bece5..d11ada5 100644
--- a/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplates.properties
+++ b/appserver/persistence/cmp/support-ejb/src/main/java/com/sun/jdo/spi/persistence/support/ejb/ejbc/CMPTemplates.properties
@@ -35,7 +35,7 @@
 imports=\
     java.util.Collection;\
     java.util.ResourceBundle;\
-    javax.ejb.*;
+    jakarta.ejb.*;
 
 # interfaces to be implemented by the bean.
 interfaces=\
@@ -290,7 +290,7 @@
 # Important: NO non-jdk, and/or non-j2ee standard classes should be imported
 # to avoid name overlap with a user-defined classes.
 helperImports=\
-    javax.ejb.*;
+    jakarta.ejb.*;
 
 #
 # Static variables.

appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java

diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java
index c21d7b0..50f72d7 100644
--- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java
+++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/SQLStateManager.java
@@ -2225,7 +2225,7 @@
                     !(source instanceof String) &&
                     !(source instanceof Character) &&
                     !(source instanceof Boolean) &&
-                    // RESOLVE: #javax.ejb package# !(source instanceof javax.ejb.EJBObject) &&
+                    // RESOLVE: #jakarta.ejb package# !(source instanceof jakarta.ejb.EJBObject) &&
                     !(source instanceof com.sun.jdo.api.persistence.support.PersistenceCapable) &&
                     !(source instanceof byte[])) {
                 try {

appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java

diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java
index b254370..6742da2 100644
--- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java
+++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java
@@ -1101,8 +1101,8 @@
         i.method = removeMethod;
         
         // Method must be a remove method defined on one of :
-        // javax.ejb.EJBHome, javax.ejb.EJBObject, javax.ejb.EJBLocalHome,
-        // javax.ejb.EJBLocalObject
+        // jakarta.ejb.EJBHome, jakarta.ejb.EJBObject, jakarta.ejb.EJBLocalHome,
+        // jakarta.ejb.EJBLocalObject
         Class declaringClass = removeMethod.getDeclaringClass();
         i.isHome = ( (declaringClass == jakarta.ejb.EJBHome.class) ||
                      (declaringClass == jakarta.ejb.EJBLocalHome.class) );

appserver/pom.xml

diff --git a/appserver/pom.xml b/appserver/pom.xml
index 3ba71ad..20edee6 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -47,7 +47,7 @@
         <mojarra.version>3.0.0-RC1</mojarra.version>
         <jsf-ext.version>0.2</jsf-ext.version>
         <woodstock.version>5.0-SNAPSHOT</woodstock.version>
-        <javax.ejb-api.version>4.0.0-RC1</javax.ejb-api.version>
+        <jakarta.ejb-api.version>4.0.0-RC1</jakarta.ejb-api.version>
         <jakarta.interceptor-api.version>2.0.0-RC2</jakarta.interceptor-api.version>
         <javax.transaction-api.version>2.0.0-RC1</javax.transaction-api.version>
         <jakarta.faces-api.version>3.0.0-RC1</jakarta.faces-api.version>
@@ -352,13 +352,13 @@
                             <artifact>
                                 <groupId>jakarta.ejb</groupId>
                                 <artifactId>jakarta.ejb-api</artifactId>
-                                <version>${javax.ejb-api.version}</version>
+                                <version>${jakarta.ejb-api.version}</version>
                             </artifact>
                             <nonFinal>false</nonFinal>
                             <jarType>api</jarType>
-                            <specVersion>${javax.ejb-api.version}</specVersion>
-			    <specImplVersion>${javax.ejb-api.version}</specImplVersion>
-                            <apiPackage>javax.ejb</apiPackage>
+                            <specVersion>${jakarta.ejb-api.version}</specVersion>
+			    <specImplVersion>${jakarta.ejb-api.version}</specImplVersion>
+                            <apiPackage>jakarta.ejb</apiPackage>
                         </spec>
                         <spec>
                             <artifact>
@@ -470,7 +470,7 @@
             <dependency>
                 <groupId>jakarta.ejb</groupId>
                 <artifactId>jakarta.ejb-api</artifactId>
-                <version>${javax.ejb-api.version}</version>
+                <version>${jakarta.ejb-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.interceptor</groupId>

appserver/security/core-ee/src/main/java/com/sun/enterprise/security/authorize/PolicyContextHandlerImpl.java

diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/authorize/PolicyContextHandlerImpl.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/authorize/PolicyContextHandlerImpl.java
index b3bcb0e..124c751 100644
--- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/authorize/PolicyContextHandlerImpl.java
+++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/authorize/PolicyContextHandlerImpl.java
@@ -30,8 +30,8 @@
 
     public static final String HTTP_SERVLET_REQUEST = "jakarta.servlet.http.HttpServletRequest";
     public static final String SOAP_MESSAGE = "jakarta.xml.soap.SOAPMessage";
-    public static final String ENTERPRISE_BEAN = "javax.ejb.EnterpriseBean";
-    public static final String EJB_ARGUMENTS = "javax.ejb.arguments";
+    public static final String ENTERPRISE_BEAN = "jakarta.ejb.EnterpriseBean";
+    public static final String EJB_ARGUMENTS = "jakarta.ejb.arguments";
     public static final String SUBJECT = "javax.security.auth.Subject.container";
     public static final String REUSE = "java.security.Policy.supportsReuse";
 

appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java
index 62930ce..c359bd2 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBean.java
@@ -21,7 +21,7 @@
 
 package foo;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  *

appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
index 84cebab..06ff63e 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-ejb/src/java/foo/MySessionBeanRemote.java
@@ -21,7 +21,7 @@
 
 package foo;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
index 4772fe8..7c6b79d 100644
--- a/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
+++ b/appserver/tests/appserv-tests/devtests/admin/cli/apps/MyEjb/MyEjb-war/src/java/MyEjbServlet.java
@@ -22,7 +22,7 @@
 import foo.MySessionBeanRemote;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;

appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
index 57252b8..fff74a0 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.oracle.javaee7.samples.batch.chunk.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java
index c5c3e8a..68ae846 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/Sless.java
@@ -10,7 +10,7 @@
 
 package com.oracle.javaee7.samples.batch.chunk;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
index 43de0a0..7c7b0e6 100644
--- a/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/bmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/chunk/SlessBean.java
@@ -19,10 +19,10 @@
 import javax.batch.operations.JobOperator;
 import javax.batch.runtime.BatchRuntime;
 import javax.batch.runtime.JobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 
 @TransactionManagement(TransactionManagementType.BEAN)
 @Stateless

appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
index 693cee5..86725d8 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.oracle.javaee7.samples.batch.cmt.chunk.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
index d241e5f..3224972 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
@@ -10,7 +10,7 @@
 
 package com.oracle.javaee7.samples.batch.cmt.chunk;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.Collection;
 import java.util.Map;
 import java.util.List;

appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 0c6d2d4..a9b67d9 100644
--- a/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/cmt-chunk-job/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -30,8 +30,8 @@
 import javax.batch.runtime.JobInstance;
 import com.ibm.jbatch.spi.TaggedJobExecution;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class JobSubmitterBean

appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
index 061b4f6..890bdeb 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.oracle.javaee7.samples.batch.simple.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java
index 5c5ac84..a112f41 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/Sless.java
@@ -10,7 +10,7 @@
 
 package com.oracle.javaee7.samples.batch.simple;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
index affb413..9196caa 100644
--- a/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/pay-roll-job-with-ejb/stateless/ejb/com/oracle/javaee7/samples/batch/simple/SlessBean.java
@@ -18,8 +18,8 @@
 
 import javax.batch.operations.JobOperator;
 import javax.batch.runtime.BatchRuntime;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class SlessBean

appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
index eb6f32b..c3990cd 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.oracle.javaee7.samples.batch.simple.batchlet.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java
index 195c01d..3631430 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/Sless.java
@@ -10,7 +10,7 @@
 
 package com.oracle.javaee7.samples.batch.simple.batchlet;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
index 40c6c93..282536a 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-batchlet/ejb/com/oracle/javaee7/samples/batch/simple/batchlet/SlessBean.java
@@ -19,8 +19,8 @@
 import javax.batch.operations.JobOperator;
 import javax.batch.runtime.BatchRuntime;
 import javax.batch.runtime.JobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class SlessBean

appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
index b13dea2..812a38d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.oracle.javaee7.samples.batch.cmt.chunk.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
index d241e5f..3224972 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitter.java
@@ -10,7 +10,7 @@
 
 package com.oracle.javaee7.samples.batch.cmt.chunk;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.Collection;
 import java.util.Map;
 import java.util.List;

appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
index 0c6d2d4..a9b67d9 100644
--- a/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/simple-validation-test/ejb/com/oracle/javaee7/samples/batch/cmt/chunk/JobSubmitterBean.java
@@ -30,8 +30,8 @@
 import javax.batch.runtime.JobInstance;
 import com.ibm.jbatch.spi.TaggedJobExecution;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class JobSubmitterBean

appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
index 55fb7e3..c10758d 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.oracle.javaee7.samples.batch.twosteps.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java
index b0c2039..892a7ef 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/Sless.java
@@ -10,7 +10,7 @@
 
 package com.oracle.javaee7.samples.batch.twosteps;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
index d1cb1ff..415b313 100644
--- a/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/batch/two-steps-job/ejb/com/oracle/javaee7/samples/batch/twosteps/SlessBean.java
@@ -19,8 +19,8 @@
 import javax.batch.operations.JobOperator;
 import javax.batch.runtime.BatchRuntime;
 import javax.batch.runtime.JobExecution;
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class SlessBean

appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
index 65d580f..4ccadc7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/client/Client.java
@@ -16,7 +16,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.InitialContext;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java
index 851ca56..be2b008 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/Sless.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
index 30d299a..f0f4d56 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/deployment-option/ejb/SlessEJB.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 
 

appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
index 339f717..f96b043 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/client/Client.java
@@ -16,7 +16,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.InitialContext;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java
index 851ca56..be2b008 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/Sless.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
index 30d299a..f0f4d56 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/implicit/simple-ejb-cdi/ejb/SlessEJB.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 
 

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index ac6170c..890e9cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -22,7 +22,7 @@
 import java.util.logging.Logger;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
+import jakarta.ejb.EJBContext;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
index b727c50..86eec7b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/api/UserService.java
@@ -21,7 +21,7 @@
 
 package org.glassfish.cditest.user.api;
 
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import org.glassfish.cditest.user.api.model.User;
 
 /**

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
index 8284c73..bdf5928 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
@@ -19,9 +19,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.ejb.EJBException;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 import org.glassfish.cditest.security.api.Secure;
 import org.glassfish.cditest.user.api.UserService;

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
index 77edccf..9196c91 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-at-interceptors/servlet/test/servlet/InterceptorsTestServlet.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
index ac6170c..890e9cd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/security/interceptor/SecurityInterceptor.java
@@ -22,7 +22,7 @@
 import java.util.logging.Logger;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
+import jakarta.ejb.EJBContext;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
index b727c50..86eec7b 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/api/UserService.java
@@ -21,7 +21,7 @@
 
 package org.glassfish.cditest.user.api;
 
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import org.glassfish.cditest.user.api.model.User;
 
 /**

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
index d938b81..ad8e6db 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/org/glassfish/cditest/user/impl/UserServiceImpl.java
@@ -19,9 +19,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.ejb.EJBException;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 import org.glassfish.cditest.security.api.Secure;
 import org.glassfish.cditest.user.api.UserService;

appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java
index 77edccf..9196c91 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/interceptors/interceptors-use-of-interceptors-in-ejbs-through-interceptor-bindings/servlet/test/servlet/InterceptorsTestServlet.java
@@ -19,7 +19,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
index 9948f7c..e6b1c7f 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/beans/nonmock/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
index 64e874e..7de9921 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-injection-no-interface-ejb/servlet/test/ejb/TestNoInterfaceEJB.java
@@ -16,7 +16,7 @@
 
 package test.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.inject.Inject;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java
index 0993e59..95d10f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/api/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb.api;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
index 9d3649a..8a461aa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -19,10 +19,10 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.DependsOn;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
index 6881f21..a54c59e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/ejb/com/acme/ejb/impl/Singleton4.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb.impl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
index 221e1e4..b2b2878 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/em-resource-injection-with-resource-declaration-in-another-jar/war/com/acme/servlet/HelloServlet.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.inject.Inject;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
index 4065801..faf3af0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-passivating-scope/servlet/test/ejb/TestEJB.java
@@ -16,7 +16,7 @@
 
 package test.ejb;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
index b20fae4..dd118e7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_BusinessMethodProducer.java
@@ -23,7 +23,7 @@
 import test.beans.artifacts.ProducedViaProducerMethod;
 import test.beans.artifacts.ProducedViaStaticField;
 
-@javax.ejb.Singleton
+@jakarta.ejb.Singleton
 public class JPAResourceProducerSingletonEJB_BusinessMethodProducer {
     @PersistenceUnit(unitName="pu1")
     EntityManagerFactory customerDatabasePersistenceUnit;

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
index adbca7b..79c781e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/jpa-resource-injection-with-singleton-ejb-producer/servlet/test/ejb/JPAResourceProducerSingletonEJB_StaticField.java
@@ -22,7 +22,7 @@
 
 import test.beans.artifacts.ProducedViaStaticField;
 
-@javax.ejb.Singleton
+@jakarta.ejb.Singleton
 public class JPAResourceProducerSingletonEJB_StaticField {
     @Produces @PersistenceUnit(unitName="pu1") @ProducedViaStaticField 
     public static EntityManagerFactory customerDatabasePersistenceUnit1;

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index edadb04..b0e9baa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.local;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index a6eaacd..78ceaef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.nointerfacebeanview;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java
index 18054b1..df07ce7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/local/TestLocalEJB.java
@@ -16,8 +16,8 @@
 
 package test.ejb.local;
 
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Local(TestInterface.class)

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
index ec60e4d..680ee42 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/no-interface-ejb/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
@@ -16,7 +16,7 @@
 
 package test.ejb.nointerfacebeanview;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 @Stateless

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
index edadb04..b0e9baa 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/local/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.local;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
index ccd055e..3c75b8a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/beans/nonmock/nointerfacebeanview/TestEJBInjectionViaAtEJB.java
@@ -16,7 +16,7 @@
 
 package test.beans.nonmock.nointerfacebeanview;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Named;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java
index ce06ab6..6ad195d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/local/TestLocalEJB.java
@@ -16,8 +16,8 @@
 
 package test.ejb.local;
 
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Local(TestInterface.class)

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
index 64ebd63..9509c39 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/nointerfacebeanview/TestNoInterfaceEJB.java
@@ -16,7 +16,7 @@
 
 package test.ejb.nointerfacebeanview;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 @Stateless

appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
index 96b85d8..0b6f4ee 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-component-resources/slsb-injection-into-sessionscoped/servlet/test/ejb/slsb/TestSLSB.java
@@ -15,7 +15,7 @@
  */
 
 package test.ejb.slsb;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.enterprise.context.Dependent;
 import javax.inject.Named;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java
index 0993e59..95d10f0 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/api/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb.api;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
index f969da6..27ba611 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/HelloSingleton.java
@@ -19,10 +19,10 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.DependsOn;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 import javax.inject.Inject;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
index 6881f21..a54c59e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/ejb/com/acme/ejb/impl/Singleton4.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb.impl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
index 7f9875a..c7d69ac 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/war/com/acme/servlet/HelloServlet.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;
 import javax.servlet.ServletException;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
index f582a2a..49ccf52 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 
 public interface MessageChecker extends EJBObject {
     int getMessageCount() throws RemoteException;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
index 2751b06..a7f24be 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
@@ -22,10 +22,10 @@
 import java.sql.Statement;
 import java.util.Properties;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
index 9b56081..335b681 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
@@ -18,8 +18,8 @@
 
 import java.rmi.RemoteException;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index 0d17b43..7422ff3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/embedded-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -18,8 +18,8 @@
 
 import java.sql.Statement;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
@@ -45,7 +45,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but not final or
      * static), with a return type of void, and with one argument of type
-     * javax.ejb.MessageDrivenContext.
+     * jakarta.ejb.MessageDrivenContext.
      * 
      * @param mdc
      *            the context to set

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
index 0abcba6..e94ddf1 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSfulEJB.java
@@ -16,7 +16,7 @@
 
 package test.ejb;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful
 public class HelloNoInterfaceLocalViewSfulEJB {

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
index 4818e1f..e01eee3 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/no-interface-local-view-proxy-serializable/servlet/test/ejb/HelloNoInterfaceLocalViewSlessEJB.java
@@ -16,7 +16,7 @@
 
 package test.ejb;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful
 public class HelloNoInterfaceLocalViewSlessEJB {

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java
index fbe5831..751d2b2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/ejb/com/acme/HelloSingleton.java
@@ -19,10 +19,10 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 @Singleton
 @Startup

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
index fff3675..13649f5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/war/com/acme/NormalLookupInEARServlet.java
@@ -20,7 +20,7 @@
 import java.io.PrintWriter;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java
index fbe5831..751d2b2 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/ejb/com/acme/HelloSingleton.java
@@ -19,10 +19,10 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 @Singleton
 @Startup

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
index 646b891..8f0c6d7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/war/com/acme/ProgrammaticLookupInEARServlet.java
@@ -20,7 +20,7 @@
 import java.io.PrintWriter;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
index 48573f8..9706eb7 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
index bdc3f62..1dfd435 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
index 4bcc578..790606c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
index 9f53213..4ab30e4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/javaee-integration/standalone-resource-adapter-as-bean-archive/app/src/mdb/MyMessageBean.java
@@ -18,14 +18,14 @@
 
 import java.sql.Statement;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import java.rmi.RemoteException;
@@ -56,7 +56,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
index ff6f063..5fdac05 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/client/Client.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.cdi.hello.mdb.client;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.jms.Destination;
 import jakarta.jms.JMSException;
 import jakarta.jms.Message;

appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
index 8bcebbd..deb0e67 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/mdb/MessageBean.java
@@ -17,11 +17,11 @@
 package test.ejb.mdb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 import jakarta.jms.Message;

appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
index 1277335..9ee988c 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateful.java
@@ -16,8 +16,8 @@
 
 package test.ejb.session;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
 
 @Stateful(description="my stateful bean description")

appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
index f3e09ec..2546fdb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package test.ejb.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 // Hello1 interface is not annotated with @Local. If the
 // bean only implements one interface it is assumed to be

appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
index 2fc6e1f..b212179 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/session/HelloStatelessRemoteBean.java
@@ -17,8 +17,8 @@
 package test.ejb.session;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 

appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
index 22599dd..e2ebdef 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/src/test/ejb/timer/TestEJBTimerBean.java
@@ -16,9 +16,9 @@
 
 package test.ejb.timer;
 
-import javax.ejb.Schedule;
-import javax.ejb.Stateless;
-import javax.ejb.Timer;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timer;
 import javax.inject.Inject;
 
 import test.beans.BeanToTestTimerUse;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
index d5f4e93..9053e6a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/BarManagedBean.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
index 91801e7..e7bca3e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/FooManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import org.omg.CORBA.ORB;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
index fc138ad..f21d03a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
index e91a9cc..6d9206d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloSingleton.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
index f7e08bc..b094856 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
index 2113fda..3401b41 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/ManagedSuper.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
index 9095863..bcda194 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
index 15ad853..084ed7a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
index 8717bfb..7386388 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/ejb/Singleton4.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
index 0972fc0..5f538ad 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Foo2ManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import org.omg.CORBA.ORB;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
index d08c598..2c0cbe4 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/Hello.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 public interface Hello {
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
index fc138ad..f21d03a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
index 030199f..d8a5609 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.servlet.ServletConfig;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
index bd40dc3..3b5927d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.cdi.ejb.hello.session;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
index ded6d50..5c26d0a 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.cdi.ejb.hello.session;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.inject.Inject;
 
 @Stateful

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
index 97fe185..8bb0acd 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.cdi.ejb.hello.session;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
index dec52e0..e2f0cda 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.cdi.ejb.hello.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 
 @Stateless

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
index f4c3848..412b13d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/client/Client.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
index 1d87d9d..c28119d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class Foo {
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
index df16597..97d3442 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import org.omg.CORBA.ORB;
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
index 0a0e916..8167388 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/client/Client.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.cdi.hello.mdb.client;
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import jakarta.jms.*;
 import jakarta.annotation.Resource;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
index 46bff12..17709a9 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.cdi.hello.mdb;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
 
 // Hello1 interface is not annotated with @Local. If the

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
index fa86bc5..6747648 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.cdi.hello.mdb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 // Hello1 interface is not annotated with @Local. If the
 // bean only implements one interface it is assumed to be

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
index 2c3d6cc..be9c27d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/ejb/MessageBean.java
@@ -16,13 +16,13 @@
 
 package com.sun.s1asdev.cdi.hello.mdb;
 
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
 
 import jakarta.jms.MessageListener;
 import jakarta.jms.Message;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
index 6cb4e45..933edbb 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/client/Client.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
index 1d87d9d..c28119d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/Foo.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class Foo {
 

appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
index e150032..89d2c3e 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/ejb/com/acme/SingletonBean.java
@@ -19,9 +19,9 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 import javax.inject.Inject;
 
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
index b066de5..817e3d7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.resource.cci.*;
 import javax.resource.ResourceException;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
index 6e9003c..39abd65 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface CoffeeRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
index 05787c1..560ee5b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface CoffeeRemoteHome extends EJBHome {
     CoffeeRemote create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
index 0b017e8..2e668cc 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.resource.cci.*;
 import javax.resource.ResourceException;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java
index 6e9003c..39abd65 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface CoffeeRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java
index 05787c1..560ee5b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/SunRaXml/cci/ejb/CoffeeRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface CoffeeRemoteHome extends EJBHome {
     CoffeeRemote create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
index 5fdb2e7..491e9e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
index a1c633e..d1a82eb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml-module-scope/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import javax.servlet.*;
@@ -44,7 +44,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
index 50e0d1f..a655608 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
index 4aaab3d..576ce98 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
index 61c9f2d..c61b390 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
index 844a6e3..8461859 100644
--- a/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/connector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
index 61c9f2d..c61b390 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
index 287e037..a76aeba 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5-resourcesxml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import javax.servlet.*;
@@ -44,7 +44,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java
index 5737506..ccfd9f8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
index 61c9f2d..c61b390 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
index 844a6e3..8461859 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedConnector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/Customer.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
index f05ebdb..d704112 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb-resourcesxml-defaultconnpool/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/Customer.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
index 71ea8bd..5180787 100644
--- a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java
index 1557bfa..491fb94 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java
index e09173a..2c90245 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.Connection;
 import java.sql.Statement;

appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java
index 402f66a..15ebcb1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/markconnectionasbad.xa.resources-xml/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
index 0d7180a..08402a5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.mq.cmt.excpt.ejb;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
index 2fd969b..adfaa84 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import jakarta.jms.*;
 import jakarta.annotation.Resource;
 

appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
index 15402a1..2b3bd18 100755
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb-resources-xml/ejb/MessageBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 //Messages received from InQueue

appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
index ed138b8..2c8721e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import jakarta.jms.*;
 import jakarta.annotation.Resource;
 

appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
index 00c8961..90a14a2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/ejb30mdb/ejb/MessageBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 //Messages received from InQueue

appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
index 6974b78..60a7e5f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/ejb/SimpleMessageBean.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.mq.cmt.excpt.ejb;
 
-import javax.ejb.EJBException;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
+import jakarta.ejb.CreateException;
 import javax.naming.*;
 import jakarta.jms.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
index 507dcd1..9d2845b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/simplestress/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.connector.mq.simplestress.ejb;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
index 3f0a64f..5645b91 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/stress/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.connector.mq.simplestress.ejb;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
index 61e1bf3..07b3184 100644
--- a/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/mq/varhome/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.connector.mq.simplestress.ejb;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
index d4ae25c..abe85d8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonacc/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.nonacc.simple.ejb;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/Customer.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
index 71ea8bd..5180787 100644
--- a/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/nonstringmcfproperties/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java
index d41d788..820c624 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTest.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface WorkTest extends EJBObject {

appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
index 99e8d3a..1987ead 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.rmi.RemoteException;
 
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java
index 365b123..5c20b4c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/threadpool/app/src/beans/WorkTestHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface WorkTestHome extends EJBHome {
     WorkTest create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java
index 44f23d7..5af8bd2 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.txlevelswitch.test1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
index 5fa8b39..76fc38c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.txlevelswitch.test1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java
index bbb18d6..703f331 100644
--- a/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/txlevelswitch/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.txlevelswitch.test1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
index 379da94..f9fc3ef 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.resource.cci.*;
 import javax.resource.ResourceException;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
index 4c0b4da..1c90c1c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface CoffeeRemote extends EJBLocalObject {
     public void insertCoffee(String name, int quantity);

appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
index 522b112..2bf98f4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/ejb/CoffeeRemoteHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface CoffeeRemoteHome extends EJBLocalHome {
     CoffeeRemote create() throws CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
index 0821967..bc6b36c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.resource.cci.*;
 import javax.resource.ResourceException;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java
index 4c0b4da..1c90c1c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface CoffeeRemote extends EJBLocalObject {
     public void insertCoffee(String name, int quantity);

appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java
index 522b112..2bf98f4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/ejb/CoffeeRemoteHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface CoffeeRemoteHome extends EJBLocalHome {
     CoffeeRemote create() throws CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
index c699a2b..4ff0a9d 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.naming.InitialContext;
 import javax.resource.AdministeredObjectDefinitions;

appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
index f67a7ad..5959a75 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.annotation.PostConstruct;
 import javax.resource.AdministeredObjectDefinitions;
 import javax.resource.AdministeredObjectDefinition;

appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
index adc03dd..4e17586 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition-embedra/servlet/Servlet.java
@@ -24,9 +24,9 @@
 import javax.servlet.http.*;
 import javax.servlet.annotation.*;
 import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.Resource;
 import javax.transaction.UserTransaction;
 
@@ -173,7 +173,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new EJBException("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
index 6e72a41..26a4938 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.naming.InitialContext;
 import javax.resource.AdministeredObjectDefinitions;

appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
index 45e597f..537ac7a 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.annotation.PostConstruct;
 import javax.resource.AdministeredObjectDefinitions;
 import javax.resource.AdministeredObjectDefinition;

appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
index d0b3070..19e71f6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/administered-object-definition/servlet/Servlet.java
@@ -24,9 +24,9 @@
 import javax.servlet.http.*;
 import javax.servlet.annotation.*;
 import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.Resource;
 import javax.transaction.UserTransaction;
 
@@ -173,7 +173,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new EJBException("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java
index 6a242b0..bf24dbd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
index fa5e1c8..bbabbb3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
index cb0d388..5eb4b43 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java
index 6a242b0..bf24dbd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
index d2c3930..8fd15e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
index 467425a..a1d760b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import java.rmi.RemoteException;
@@ -45,7 +45,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
index 8ab633b..8a9b105 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/Customer.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
 {
   public String getLastName() ;
 

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java
index 5bc95ba..a7deaa1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.subclassing.ejb;
 
 public interface CustomerCheckingLocalHome extends CustomerLocalHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
index f96c315..f0dbad2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java
index cd8f522..ba8264d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java
index 9a9a25f..4179122 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.subclassing.ejb;
 
 public interface CustomerSavingsLocalHome extends CustomerLocalHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
index 5da9d2e..3fdf39c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
 import javax.servlet.*; 
 import javax.naming.*; 
 import javax.servlet.http.*; 
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
index 6db25c4..702f0d8 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
index d6950b7..cdf3dcb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java
index 9d76881..bfca37a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
index efa2125..4a46e3c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerEJB.java
@@ -18,7 +18,7 @@
 
 import connector.MyAdminObject;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.Properties;
 import java.sql.*;
 import java.rmi.RemoteException;

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
index bc32dc0..e5db294 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java
index 9d76881..bfca37a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.sql.SQLException;
 

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
index 933be01..5231d9b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerEJB.java
@@ -18,7 +18,7 @@
 
 import connector.MyAdminObject;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.Properties;
 import java.sql.*;
 import java.rmi.RemoteException;

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java
index dfc3820..e25e135 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/beans/MessageCheckerHome.java
@@ -17,8 +17,8 @@
 package beans;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface MessageCheckerHome extends EJBHome {
     MessageChecker create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
index bc32dc0..e5db294 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java
index a7bcfba..c94e7ea 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 import java.util.Properties;
 

appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java
index 600b614..6068415 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPBean.java
@@ -18,7 +18,7 @@
 
 import com.sun.s1asdev.custom.resource.CustomResourceJavaBean;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java
index a7e3374..e703735 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources-resources-xml/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java
index 576cc1b..8cab5e4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 import java.util.Properties;
 

appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java
index 0c9e83d..e3659e3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPBean.java
@@ -19,7 +19,7 @@
 import com.sun.s1asdev.custom.resource.CustomResourceJavaBean;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.rmi.RemoteException;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java
index a7e3374..e703735 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/built-in-custom-resources/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java
index d298e6c..e862cae 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.serializabletest.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface SimpleSession extends EJBLocalObject {
     public boolean test1() ;

appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java
index 633fd36..37f378b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.serializabletest.ejb;
 
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
 import javax.naming.InitialContext;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -26,11 +26,11 @@
 public class SimpleSessionBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java
index 6a9f389..0a39173 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.serializabletest.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface SimpleSessionHome extends EJBLocalHome {
     SimpleSession create()

appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
index b40a3f1..1a8b7f4 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/config-property-accessor-test/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
index ccd9727..28d40a8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.naming.InitialContext;
 import javax.resource.ConnectionFactoryDefinitions;

appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
index 185e638..7dc137e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.annotation.PostConstruct;
 import javax.resource.ConnectionFactoryDefinitions;
 import javax.resource.ConnectionFactoryDefinition;

appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
index 659e1ba..4069f24 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition-embedra/servlet/Servlet.java
@@ -27,9 +27,9 @@
 import javax.servlet.http.*;
 import javax.servlet.annotation.*;
 import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.Resource;
 import javax.transaction.UserTransaction;
 
@@ -175,7 +175,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new EJBException("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
index 55cc253..96beb4c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.naming.InitialContext;
 import javax.resource.ConnectionFactoryDefinitions;

appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
index ad40503..c1e1b3f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.annotation.PostConstruct;
 import javax.resource.ConnectionFactoryDefinitions;
 import javax.resource.ConnectionFactoryDefinition;

appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
index f4eb29a..8a597e8 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connection-factory-definition/servlet/Servlet.java
@@ -27,9 +27,9 @@
 import javax.servlet.http.*;
 import javax.servlet.annotation.*;
 import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.Resource;
 import javax.transaction.UserTransaction;
 
@@ -175,7 +175,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new EJBException("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java
index 6a242b0..bf24dbd 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
index d2c3930..8fd15e1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
index bc32dc0..e5db294 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.5/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
index 8c2cd64..071bca7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
index 9e1ec9c..7283014 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6-resources-xml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import java.rmi.RemoteException;
@@ -45,7 +45,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
index 8c2cd64..071bca7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
index 9e1ec9c..7283014 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/connector1.6/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import java.rmi.RemoteException;
@@ -45,7 +45,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java
index a7bcfba..c94e7ea 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 import java.util.Properties;
 

appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java
index 600b614..6068415 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPBean.java
@@ -18,7 +18,7 @@
 
 import com.sun.s1asdev.custom.resource.CustomResourceJavaBean;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java
index a7e3374..e703735 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/custom-resources-gf-resources-module-scoped/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.CustomResourceFactories.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
index 1c9d796..e7eb489 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;

appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
index 5bbf7d8..db30d12 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java
index 0455254..67aa6c6 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/datasource-definition/servlet/Servlet.java
@@ -20,9 +20,9 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resources;
 import javax.sql.DataSource;
@@ -207,7 +207,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new EJBException("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java
index 5821cbe..5f5e16d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface MessageChecker extends EJBLocalObject {
     int getMessageCount();

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java
index b39584b..21a82d7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java
index 11b69f9..f5c8f22 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
index cf1877b..7a40e6e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource-standalone-rar/app/src/mdb/MyMessageBean.java
@@ -18,7 +18,7 @@
 
 import connector.MyMessageListener;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -45,7 +45,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but
      * not final or static), with a return type of void, and
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java
index 5821cbe..5f5e16d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface MessageChecker extends EJBLocalObject {
     int getMessageCount();

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java
index 32f2e0a..1392691 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerEJB.java
@@ -18,10 +18,10 @@
 
 import connector.MyAdminObject;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java
index 11b69f9..f5c8f22 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
index 1b2cc5a..fb3f307 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/defaultConnectorResource/app/src/mdb/MyMessageBean.java
@@ -18,7 +18,7 @@
 
 import connector.MyMessageListener;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import java.rmi.RemoteException;
@@ -47,7 +47,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but
      * not final or static), with a return type of void, and
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
index 8b3b11c..b6e7a64 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ModernBean.java
@@ -20,9 +20,9 @@
 import com.sun.s1asdev.ejb.ejb32.mdb.ra.CommandListener;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.MessageDrivenContext;
 import javax.interceptor.Interceptors;
 
 /**

appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java
index 0236fd3..4622ee1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsBean.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
 
-import javax.ejb.LocalBean;
-import javax.ejb.Lock;
-import javax.ejb.LockType;
-import javax.ejb.Singleton;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Lock;
+import jakarta.ejb.LockType;
+import jakarta.ejb.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;

appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java
index 77808c0..828f191 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/ejb32-mdb/ejb/ResultsRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.List;
 
 /**

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
index 8ab633b..8a9b105 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/Customer.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
 {
   public String getLastName() ;
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java
index 5bc95ba..a7deaa1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.subclassing.ejb;
 
 public interface CustomerCheckingLocalHome extends CustomerLocalHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
index a0145ab..0520b60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java
index cd8f522..ba8264d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java
index 9a9a25f..4179122 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.subclassing.ejb;
 
 public interface CustomerSavingsLocalHome extends CustomerLocalHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
index aafc4b5..de8a419 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb-resources-xml/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
 import javax.servlet.*; 
 import javax.naming.*; 
 import javax.servlet.http.*; 
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
index 8ab633b..8a9b105 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/Customer.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
 {
   public String getLastName() ;
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java
index 5bc95ba..a7deaa1 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.subclassing.ejb;
 
 public interface CustomerCheckingLocalHome extends CustomerLocalHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
index a0145ab..0520b60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java
index cd8f522..ba8264d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java
index 9a9a25f..4179122 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.subclassing.ejb;
 
 public interface CustomerSavingsLocalHome extends CustomerLocalHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
index 5da9d2e..3fdf39c 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/embeddedweb/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
 import javax.servlet.*; 
 import javax.naming.*; 
 import javax.servlet.http.*; 
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java
index 88ba87b..ee22914 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 import java.rmi.RemoteException;
 
 public interface VersionChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
index 4417224..a00913a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerEJB.java
@@ -16,9 +16,9 @@
 
 package beans;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.CreateException;
 import javax.naming.*;
 import com.sun.jdbcra.spi.JdbcSetupAdmin;
 

appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java
index 97fc812..d8dfa47 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/app/src/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface VersionCheckerHome extends EJBLocalHome {
     VersionChecker create() throws CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java
index e952419..5635abc 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface VersionChecker extends EJBLocalObject {
     int getVersion() ;

appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java
index 806cfab..372df6d 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java
index 08d8c64..b77b16f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/force-deploy-rar/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface VersionCheckerHome extends EJBLocalHome {
     VersionChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
index 7bfd3b7..ac9c971 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/Customer.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.installed_libraries_embedded.ejb;
 
-public interface Customer extends javax.ejb.EJBLocalObject
+public interface Customer extends jakarta.ejb.EJBLocalObject
 {
   public String getLastName() ;
 

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
index 3bde644..82c41a6 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.installed_libraries_embedded.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java
index 1265f26..ae8e784 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerCheckingLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.installed_libraries_embedded.ejb;
 
 public interface CustomerCheckingLocalHome extends CustomerLocalHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
index 9baca65..0f9c9af 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.installed_libraries_embedded.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java
index 145b56e..7d762e3 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerLocalHome.java
@@ -16,9 +16,9 @@
 
 package samples.ejb.installed_libraries_embedded.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome {
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
index ef1d1e6..9f5b76b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.installed_libraries_embedded.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java
index 27c899e..46f7b6b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/ejb/CustomerSavingsLocalHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.installed_libraries_embedded.ejb;
 
 public interface CustomerSavingsLocalHome extends CustomerLocalHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
index cbbbd50..a2f103e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-embedded/servlet/SimpleBankServlet.java
@@ -21,7 +21,7 @@
 import javax.servlet.*; 
 import javax.naming.*; 
 import javax.servlet.http.*; 
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.installed_libraries_embedded.ejb.*;
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java
index c5d2622..17705ef 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.installed_libraries_test.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface SimpleSession extends EJBLocalObject {
     public boolean test1() ;

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java
index 44fed4a..ba123ee 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.installed_libraries_test.ejb;
 
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
 import javax.naming.InitialContext;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -26,11 +26,11 @@
 public class SimpleSessionBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java
index e2785a6..2f61d85 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.installed_libraries_test.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface SimpleSessionHome extends EJBLocalHome {
     SimpleSession create()

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
index 1f1fe1f..8193c01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries-resources/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java
index c5d2622..17705ef 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.installed_libraries_test.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface SimpleSession extends EJBLocalObject {
     public boolean test1() ;

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java
index 44fed4a..ba123ee 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.installed_libraries_test.ejb;
 
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
 import javax.naming.InitialContext;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -26,11 +26,11 @@
 public class SimpleSessionBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java
index e2785a6..2f61d85 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.installed_libraries_test.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface SimpleSessionHome extends EJBLocalHome {
     SimpleSession create()

appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
index 1f1fe1f..8193c01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/installed-libraries/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java
index cac5c71..d7be43b 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloEJB.java
@@ -21,7 +21,7 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSConnectionFactoryDefinition;

appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java
index c474997..1161e8c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/ejb/HelloStatefulEJB.java
@@ -21,7 +21,7 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSConnectionFactoryDefinition;

appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java
index d254817..0ec1e01 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-connection-factory-definition/servlet/Servlet.java
@@ -22,8 +22,8 @@
 import java.util.Collection;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSConnectionFactoryDefinition;
@@ -204,7 +204,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new Exception("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java
index 53bc9ef..37347a5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloEJB.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jms.Destination;
 import jakarta.jms.JMSDestinationDefinition;
 import jakarta.jms.JMSDestinationDefinitions;

appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java
index be5d6a2..16c611c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/ejb/HelloStatefulEJB.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.jms.Destination;
 import jakarta.jms.JMSDestinationDefinition;
 import jakarta.jms.JMSDestinationDefinitions;

appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java
index 0174ed6..eb95435 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jms-destination-definition/servlet/Servlet.java
@@ -20,8 +20,8 @@
 import java.io.PrintWriter;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
 import jakarta.jms.Destination;
 import jakarta.jms.JMSDestinationDefinition;
 import jakarta.jms.JMSDestinationDefinitions;
@@ -183,7 +183,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new Exception("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
index 3c03e91..5d6c0ac 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import java.sql.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.transaction.UserTransaction;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java
index 4c970be..06e0dc5 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
index 5531853..c873b9f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulBean.java
@@ -21,17 +21,17 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @EJB(name="ejb/SfulBean", 

appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
index 03e7f74..de756e7 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
index f06f15c..714510f 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/jpa-tx-propagation-gf-resources-xml/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
index fa1049f..49ebba4 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
index d6950b7..cdf3dcb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources-app-module-scoped/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
@@ -43,7 +43,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java
index 4e8f7f1..8f68ddf 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 
 public interface MessageChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
index b17c849..c682f0a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import connector.MyAdminObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java
index e9bc945..dd09451 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/beans/MessageCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface MessageCheckerHome extends EJBLocalHome {
     MessageChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
index 03b61c6..1b5c5eb 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/multiple-resources.xml/app/src/mdb/MyMessageBean.java
@@ -17,7 +17,7 @@
 package mdb;
 
 import connector.MyMessageListener;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.io.*;
 import javax.servlet.*;
@@ -44,7 +44,7 @@
     /**
      * setMessageDrivenContext method, declared as public (but 
      * not final or static), with a return type of void, and 
-     * with one argument of type javax.ejb.MessageDrivenContext.
+     * with one argument of type jakarta.ejb.MessageDrivenContext.
      *
      * @param mdc    the context to set
      */

appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
index 16beae0..08107a5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/Customer.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 import java.rmi.RemoteException;
 
 public interface Customer extends EJBLocalObject

appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
index faa5ac3..9093b7e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 
 public class CustomerCheckingEJB extends CustomerEJB

appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java
index 656fb65..ab153f5 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerCheckingHome.java
@@ -17,8 +17,8 @@
 package samples.ejb.subclassing.ejb;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
index a0145ab..0520b60 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java
index 0793149..beffdd0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerHome.java
@@ -16,6 +16,6 @@
 
 package samples.ejb.subclassing.ejb;
 
-public interface CustomerHome extends javax.ejb.EJBLocalHome {
+public interface CustomerHome extends jakarta.ejb.EJBLocalHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/nonstringmcfproperties/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java
index ac08686..9b8849e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.rar_accessibility_test.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface SimpleSession extends EJBLocalObject {
     public boolean test1(int expectedCount) ;

appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
index ec8512e..6c4056a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.rar_accessibility_test.ejb;
 
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
 import javax.naming.InitialContext;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -26,11 +26,11 @@
 public class SimpleSessionBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java
index 7793726..ef006f7 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.rar_accessibility_test.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface SimpleSessionHome extends EJBLocalHome {
     SimpleSession create()

appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
index 6f990c9..553cc61 100644
--- a/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/rar-accessibility/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java
index 88ba87b..ee22914 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 import java.rmi.RemoteException;
 
 public interface VersionChecker extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
index 4417224..a00913a 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerEJB.java
@@ -16,9 +16,9 @@
 
 package beans;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.CreateException;
 import javax.naming.*;
 import com.sun.jdbcra.spi.JdbcSetupAdmin;
 

appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java
index 97fc812..d8dfa47 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/app/src/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface VersionCheckerHome extends EJBLocalHome {
     VersionChecker create() throws CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java
index ea60190..a8dce7e 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionChecker.java
@@ -16,7 +16,7 @@
 
 package beans;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface VersionChecker extends EJBLocalObject {
     int getVersion() ;

appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
index f947c08..871b6e2 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerEJB.java
@@ -17,10 +17,10 @@
 package beans;
 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.util.Properties;
 import java.util.Vector;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java
index 08d8c64..b77b16f 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/redeployRar/ejb/VersionCheckerHome.java
@@ -16,8 +16,8 @@
 
 package beans;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface VersionCheckerHome extends EJBLocalHome {
     VersionChecker create() throws  CreateException;

appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java
index f48f7c9..0455709 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.connector.serializabletest.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 import java.rmi.RemoteException;
 
 public interface SimpleSession extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java
index 633fd36..37f378b 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.serializabletest.ejb;
 
-import javax.ejb.EJBContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionBean;
 import javax.naming.InitialContext;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -26,11 +26,11 @@
 public class SimpleSessionBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java
index 6a9f389..0a39173 100755
--- a/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/v3/serializabletest/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.connector.serializabletest.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface SimpleSessionHome extends EJBLocalHome {
     SimpleSession create()

appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
index 2548584..5922f31 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/Customer.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
index b3b9bc1..ee0d17c 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java
index 0bb8f41..69f6580 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
index a0145ab..0520b60 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java
index 3d58631..166572e 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
index 199aa62..f30b506 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java
index fc07ccd..f99f1d0 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java b/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
index a904c68..7a48ac1 100644
--- a/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
+++ b/appserver/tests/appserv-tests/devtests/connector/web2connector/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 import com.sun.jdbcra.spi.JdbcSetupAdmin;

appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
index c144ee0..08498d1 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/src/Client.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import test.ejb.stateful.SFHello;
 

appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml
index 19cffb5..b349c3c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml
@@ -91,7 +91,7 @@
       </resource-ref>
       <resource-env-ref>
         <resource-env-ref-name>test.ejb.stateless.InterceptorB/sessionCtx</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.SessionContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.stateless.InterceptorB</injection-target-class>
           <injection-target-name>sessionCtx</injection-target-name>

appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
index 83a187a..85740a0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorA.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
index 5d146d9..57b7426 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/InterceptorB.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 

appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java
index be270fb..dcca8b2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest1.java
@@ -16,11 +16,11 @@
 
 package test.ejb.stateful;
 
-import javax.ejb.EJB;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 
 import test.ejb.stateless.*;
 

appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java
index 66659f8..c870de7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatefulTest2.java
@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.TransactionManagementType;
 
 import test.ejb.stateful.SFHello;
 

appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
index 0f7bd1b..d9c0c7a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest1.java
@@ -19,11 +19,11 @@
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionManagementType;
 import javax.interceptor.Interceptors;
 
 /**

appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java
index 691efe3..79165d6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/src/StatelessTest2.java
@@ -19,10 +19,10 @@
 import jakarta.annotation.security.DenyAll;
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 /**
  * @author Shing Wai Chan

appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml
index 7e6864a..482ed70 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml
@@ -47,7 +47,7 @@
       <resource-env-ref>
         <description>testing</description>
         <resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest</injection-target-class>
           <injection-target-name>ejbContext</injection-target-name>
@@ -55,7 +55,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>sfContext</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>StatefulTest2</injection-target-class>
           <injection-target-name>ejbContext</injection-target-name>
@@ -63,7 +63,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>test.ejb.StatefulTest/ejbContext2</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest</injection-target-class>
           <injection-target-name>ejbContext2</injection-target-name>
@@ -71,7 +71,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>sfContext2</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>StatefulTest2</injection-target-class>
           <injection-target-name>ejbContext2</injection-target-name>
@@ -79,7 +79,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>test.ejb.StatefulTest/ejbContext3</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest</injection-target-class>
           <injection-target-name>ejbContext3</injection-target-name>
@@ -137,7 +137,7 @@
       <resource-env-ref>
         <description>testing</description>
         <resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest</injection-target-class>
           <injection-target-name>ejbContext</injection-target-name>
@@ -145,7 +145,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>sfEjbContext</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest1</injection-target-class>
           <injection-target-name>ejbContext</injection-target-name>
@@ -153,7 +153,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>sfEjbContext2</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest1</injection-target-class>
           <injection-target-name>ejbContext2</injection-target-name>
@@ -161,7 +161,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>sfEjbContext3</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest1</injection-target-class>
           <injection-target-name>ejbContext3</injection-target-name>
@@ -200,7 +200,7 @@
       <resource-env-ref>
         <description>testing</description>
         <resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest</injection-target-class>
           <injection-target-name>ejbContext</injection-target-name>
@@ -208,7 +208,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>test.ejb.StatefulTest/ejbContext2</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest</injection-target-class>
           <injection-target-name>ejbContext2</injection-target-name>
@@ -216,7 +216,7 @@
       </resource-env-ref>
       <resource-env-ref>
         <resource-env-ref-name>test.ejb.StatefulTest/ejbContext3</resource-env-ref-name>
-        <resource-env-ref-type>javax.ejb.EJBContext</resource-env-ref-type>
+        <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
         <injection-target>
           <injection-target-class>test.ejb.StatefulTest</injection-target-class>
           <injection-target-name>ejbContext3</injection-target-name>

appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java
index dd91dc4..78c03f5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest.java
@@ -19,13 +19,13 @@
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
-import javax.ejb.Local;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.Local;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import javax.sql.DataSource;
 
 /**

appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java
index a055054..8a30968 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest1.java
@@ -17,12 +17,12 @@
 package test.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import javax.sql.DataSource;
 
 /**

appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java
index 3ca00a3..0f804bd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/src/StatefulTest2.java
@@ -17,11 +17,11 @@
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJBContext;
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 import test.ejb.SFHello1;
 import test.ejb.StatefulTest;

appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
index f7f64ce..d96c3b6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/annotation/web/src/ServletTest.java
@@ -21,7 +21,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.security.DeclareRoles;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
index 4f9032f..5293865 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.deployment.noappxml.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.deployment.noappxml.ejb.Sful;
 import com.sun.s1asdev.deployment.noappxml.ejb.Sless;
 

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java
index e3d6998..36a9bff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SfulEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.deployment.noappxml.ejb;
 
 import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
 
 @Stateful
 @Remote({Sful.class})

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java
index 542b812..fbec4fb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/dir_deploy/ejb/SlessEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.deployment.noappxml.ejb;
 
 import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
 
 @Stateless
 @Remote({Sless.class})

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
index 4f9032f..5293865 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.deployment.noappxml.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.deployment.noappxml.ejb.Sful;
 import com.sun.s1asdev.deployment.noappxml.ejb.Sless;
 

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java
index e3d6998..36a9bff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SfulEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.deployment.noappxml.ejb;
 
 import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
 
 @Stateful
 @Remote({Sful.class})

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java
index 542b812..fbec4fb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/ejb/SlessEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.deployment.noappxml.ejb;
 
 import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
 
 @Stateless
 @Remote({Sless.class})

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
index 0014b9a..1f875ea 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.net.*;
 import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.deployment.noappxml.ejb.Sful;
 import com.sun.s1asdev.deployment.noappxml.ejb.Sless;
 

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java
index e3d6998..36a9bff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SfulEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.deployment.noappxml.ejb;
 
 import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
 
 @Stateful
 @Remote({Sful.class})

appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java
index 542b812..fbec4fb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/ejb/SlessEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.deployment.noappxml.ejb;
 
 import com.sun.s1asdev.deployment.noappxml.util.Util;
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
 
 @Stateless
 @Remote({Sless.class})

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
index 1e2ede8..982e81f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/client/HelloClient.java
@@ -17,7 +17,7 @@
 package standaloneclient;
 
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import statelesshello.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
index a0ec5f5..9047e64 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/Greeter.java
@@ -26,7 +26,7 @@
  * to obtain references to the bean's remote interface (Greeter, in this case).
  *
  */
-public interface Greeter extends javax.ejb.EJBObject { 
+public interface Greeter extends jakarta.ejb.EJBObject { 
     /**
      * Returns a greeting.
      * @return returns a greeting as a string.

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
index 3dbe2ad..b6bb56d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterEJB.java
@@ -23,15 +23,15 @@
  * A simple stateless bean for the HelloWorld application. This bean implements one
  * business method as declared by the remote interface.
  */
-public class GreeterEJB implements javax.ejb.SessionBean { 
+public class GreeterEJB implements jakarta.ejb.SessionBean { 
 
-    private  javax.ejb.SessionContext m_ctx = null; 
+    private  jakarta.ejb.SessionContext m_ctx = null; 
    
     /**
      * Sets the session context. Required by EJB spec.
      * @param ctx A SessionContext object.
      */
-    public void setSessionContext(javax.ejb.SessionContext ctx) { 
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) { 
         m_ctx = ctx; 
     } 
 
@@ -39,7 +39,7 @@
      * Creates a bean. Required by EJB spec.
      * @exception throws CreateException.
      */
-    public void ejbCreate() throws javax.ejb.EJBException, javax.ejb.CreateException { 
+    public void ejbCreate() throws jakarta.ejb.EJBException, jakarta.ejb.CreateException { 
         System.out.println("ejbCreate() on obj " + this); 
     } 
 

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
index 2707fba..12d023a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/ejb/GreeterHome.java
@@ -21,11 +21,11 @@
  * to obtain references to the bean's remote interface.
  *
  */
-public interface GreeterHome extends javax.ejb.EJBHome { 
+public interface GreeterHome extends jakarta.ejb.EJBHome { 
     /**
      * Gets a reference to the remote interface to the Greeter bean.
      * @exception throws CreateException and RemoteException.
      *
      */
-    public Greeter create() throws java.rmi.RemoteException, javax.ejb.CreateException; 
+    public Greeter create() throws java.rmi.RemoteException, jakarta.ejb.CreateException; 
 } 

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
index 6dff849..936ec3a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ear/war/GreeterServlet.java
@@ -22,7 +22,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.stateless.simple.ejb.*; 
 
@@ -39,7 +39,7 @@
    public void doGet (HttpServletRequest request,HttpServletResponse response) 
         throws ServletException, IOException { 
 
-        javax.ejb.Handle beanHandle; 
+        jakarta.ejb.Handle beanHandle; 
         Greeter myGreeterBean; 
         GreeterHome myGreeterHome; 
         Greeter myGreeterRemote;

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java
index df4724f..ca7d5d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/Statelesshello.java
@@ -16,7 +16,7 @@
 
 package statelesshello;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
index f1361c3..f4b611d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloEJB.java
@@ -19,9 +19,9 @@
 import java.io.Serializable;
 import java.io.InputStream;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class StatelesshelloEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java
index 7a80be8..1513c0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/directorydeploy/ejb/ejb/StatelesshelloHome.java
@@ -20,8 +20,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface StatelesshelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml
index f164ad2..82de8c3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ear/ejb/META-INF/ejb-jar.xml
@@ -593,7 +593,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>
@@ -670,7 +670,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
     </exclude-list>

appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
index 42e76b5..7fc4880 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/dol/validation/ejb/META-INF/ejb-jar.xml
@@ -498,7 +498,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>
@@ -559,7 +559,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
     </exclude-list>

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
index a53bb47..ed449a6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/helloservice/SayHelloImpl.java
@@ -19,7 +19,7 @@
 import javax.rmi.*;
 import java.rmi.*;
 import javax.naming.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import statelesshello.*;
 
 public class SayHelloImpl implements SayHello {

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java
index 6415970..1b08767 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/Statelesshello.java
@@ -16,7 +16,7 @@
 
 package statelesshello;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
index 6284103..4933850 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class StatelesshelloEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java
index 7a80be8..1513c0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/statelesshello/StatelesshelloHome.java
@@ -20,8 +20,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface StatelesshelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml
index 5347046..fb0f874 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml
@@ -53,7 +53,7 @@
 <method-intf>Remote</method-intf>
 <method-name>isIdentical</method-name>
 <method-params>
-<method-param>javax.ejb.EJBObject</method-param>
+<method-param>jakarta.ejb.EJBObject</method-param>
 </method-params>
 </method>
 <method>
@@ -66,7 +66,7 @@
 <method-intf>Home</method-intf>
 <method-name>remove</method-name>
 <method-params>
-<method-param>javax.ejb.Handle</method-param>
+<method-param>jakarta.ejb.Handle</method-param>
 </method-params>
 </method>
 <method>

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
index 92d5bd6..0981dcb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBean.java
@@ -17,7 +17,7 @@
 package justbean;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 
 public interface JustBean extends EJBObject {
 

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
index 4abfa89..539fb70 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustBeanHome.java
@@ -17,8 +17,8 @@
 package justbean;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
  
 public interface JustBeanHome extends EJBHome {
  

appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
index 37f5fe9..42b3df8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/justbean/JustSessionBean.java
@@ -17,8 +17,8 @@
 package justbean;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 public class JustSessionBean implements SessionBean {
  

appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
index df3b8fe..a5cb29f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/client/LibDirTestClient.java
@@ -17,7 +17,7 @@
 package libclasspath2.client;
 
 import java.io.IOException;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import libclasspath2.ResourceHelper;
 import libclasspath2.ejb.LookupSBRemote;
 

appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
index d20b89d..87afb58 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBBean.java
@@ -21,7 +21,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Properties;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import libclasspath2.ResourceHelper;
 
 /**

appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
index ed9fcfa..2f77f2b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/libclasspath2/ejb/LookupSBRemote.java
@@ -17,7 +17,7 @@
 package libclasspath2.ejb;
 
 import java.io.IOException;
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import libclasspath2.ResourceHelper;
 
 

appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
index 89907d6..75e9120 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBean.java
@@ -16,7 +16,7 @@
 
 package wstoejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 /**

appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
index 79a4b3f..eb720f0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanEJB.java
@@ -16,7 +16,7 @@
 
 package wstoejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 /**

appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
index 99c4bdc..f0761c5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/wstoejb/StatefulSessionBeanHome.java
@@ -17,8 +17,8 @@
 package wstoejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 /**
  * Simple interface to create a statefull session bean

appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
index 1e2ede8..982e81f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/standaloneclient/HelloClient.java
@@ -17,7 +17,7 @@
 package standaloneclient;
 
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import statelesshello.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java
index df4724f..ca7d5d5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/Statelesshello.java
@@ -16,7 +16,7 @@
 
 package statelesshello;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
index f1361c3..f4b611d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloEJB.java
@@ -19,9 +19,9 @@
 import java.io.Serializable;
 import java.io.InputStream;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class StatelesshelloEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java
index 7a80be8..1513c0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/statelesshello/StatelesshelloHome.java
@@ -20,8 +20,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface StatelesshelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
index 3e83eb2..46e08dc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/helloservice/SayHelloEJB.java
@@ -16,7 +16,7 @@
 
 package helloservice;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public class SayHelloEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
index a8064fa..62b18c5 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
 
 // Hello1 interface is not annotated with @Local. If the

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java
index cd9ff58..0fe0118 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 // Hello1 interface is not annotated with @Local. If the
 // bean only implements one interface it is assumed to be

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
index 3ab7631..c7189ff 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/mdb/webclient/ejb/MessageBean.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
 
 import jakarta.jms.MessageListener;
 import jakarta.jms.Message;

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
index a5aa811..20b9149 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/client/Client.java
@@ -19,8 +19,8 @@
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import com.sun.s1asdev.deployment.ejb30.ear.security.*;
 
 public class Client {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
index 16f0c9c..f33d2d2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.deployment.ejb30.ear.security;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
index cd0a6ab..a86666f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SfulEJB.java
@@ -21,10 +21,10 @@
 import jakarta.annotation.security.DenyAll;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateful;
 
 @RunAs(value="sunuser")
 @DeclareRoles({"j2ee", "sunuser"})

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java
index bfad418..af6efd2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/ejb/SlessEJB.java
@@ -18,10 +18,10 @@
 
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.SessionContext;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Remote({Sless.class})

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java
index e42f592..76ba5fc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/security/web/Servlet.java
@@ -20,7 +20,7 @@
 import java.io.PrintWriter;
 
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
index a04944f..f0a0087 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import jakarta.annotation.PostConstruct;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session.*;
 
 public class Client {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
index 896d72f..80af5ba 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java
index acb4650..d3599e3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful
 public class SfulEJB implements Sful

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java
index 8ed905b..e997278 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java
index 1e986fc..df1e71c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class SlessEJB implements Sless

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
index 7503393..888af7c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/Client.java
@@ -18,11 +18,11 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.EJBs;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJBTransactionRequiredException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJBTransactionRequiredException;
 import javax.naming.InitialContext;
 import javax.naming.Context;
 import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
@@ -219,7 +219,7 @@
             try {
                 sless1.hello2();
                 throw new Exception("Did not receive CreateException");
-            } catch(javax.ejb.CreateException ce) {
+            } catch(jakarta.ejb.CreateException ce) {
                 System.out.println("Successfully caught app exception");
             }
 

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java
index d728a3b..adaaf7f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/client/ClientSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
 
 public class ClientSuper {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
index 68bba90..d89469d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java
index e90831c..587c29d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
index 35e7471..a42c24c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sful2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful2

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
index 9f6a436..da9d18c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB.java
@@ -16,18 +16,18 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.naming.InitialContext;
 
 import jakarta.annotation.Resource;

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
index d368bb9..0b431e0 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SfulEJB2.java
@@ -16,19 +16,19 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
-import javax.ejb.SessionSynchronization;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
+import jakarta.ejb.SessionSynchronization;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.naming.InitialContext;
 
 import jakarta.annotation.Resource;

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java
index 5997572..325c0cc 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/Sless.java
@@ -22,7 +22,7 @@
 {
     public String hello();
 
-    public String hello2() throws javax.ejb.CreateException;
+    public String hello2() throws jakarta.ejb.CreateException;
 
     public String getId();
 

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
index 03d1b07..a9b4afb 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
-import javax.ejb.CreateException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
+import jakarta.ejb.CreateException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -37,8 +37,8 @@
         return "hello from SlessEJB";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     public String getId() {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
index 8b01cd2..4a85608 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB2.java
@@ -16,15 +16,15 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionBean;
-import javax.ejb.CreateException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;
@@ -64,8 +64,8 @@
         return "hello from SlessEJB2";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
index 098a718..09811f3 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session2/ejb/SlessEJB3.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
 import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 import java.util.Collection;
@@ -39,7 +39,7 @@
 
     private @Resource SessionContext ejbContext2;
 
-    @Resource(type=javax.ejb.SessionContext.class) 
+    @Resource(type=jakarta.ejb.SessionContext.class) 
     private EJBContext ejbContext3;
 
     private EJBContext ejbContext4;
@@ -74,7 +74,7 @@
     }
 
     private EJBContext ejbContext6;
-    @Resource(type=javax.ejb.SessionContext.class)
+    @Resource(type=jakarta.ejb.SessionContext.class)
         private void setEJBContext6(EJBContext context) {
         ejbContext6 = context;
     }
@@ -101,8 +101,8 @@
         return "hello from sless ejb3";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     public String hello3() {
@@ -119,7 +119,7 @@
         if( get1.equals(get2) ) {
             System.out.println("get1 =" + get1);
             System.out.println("get2 =" +  get2);
-            throw new javax.ejb.EJBException("SFSB get test failed");
+            throw new jakarta.ejb.EJBException("SFSB get test failed");
         }
 
         return "hello3()";

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
index b1386d2..2ac549f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;
@@ -62,13 +62,13 @@
                     ic.lookup("java:comp/env/myem");
                 
             } catch(Exception e) {
-                throw new javax.ejb.EJBException(e);
+                throw new jakarta.ejb.EJBException(e);
             }
             
 
             System.out.println("HelloEJB successful injection of EMF/EM references!");
         } else {
-            throw new javax.ejb.EJBException("One or more EMF/EM references" +
+            throw new jakarta.ejb.EJBException("One or more EMF/EM references" +
                                              " was not injected in HelloEJB");
         }
 

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
index 1fe5f69..4441bb8 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/ejb/HelloStatefulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import jakarta.annotation.PostConstruct;
 
 @Stateful public class HelloStatefulEJB implements HelloStateful {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
index a49640a..046eb0b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/session3/servlet/Servlet.java
@@ -22,9 +22,9 @@
 import javax.servlet.http.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resources;
 import javax.sql.DataSource;
@@ -200,7 +200,7 @@
 		sleepFor(10);
 		helloStateful2.ping();
 		throw new EJBException("Did not get ConcurrentAccessException");
-	    } catch (javax.ejb.ConcurrentAccessException conEx) {
+	    } catch (jakarta.ejb.ConcurrentAccessException conEx) {
 		;   //Everything is fine
 	    } catch (Throwable th) {
 		throw new EJBException("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
index 2ec0fcd..b43e380 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/client/Client.java
@@ -19,8 +19,8 @@
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import com.sun.s1asdev.deployment.ejb30.ear.xmloverride.*;
 
 public class Client {

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
index f029b2a..7f96125 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.deployment.ejb30.ear.xmloverride;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
index 44cb84c..0da941e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SfulEJB.java
@@ -21,12 +21,12 @@
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionSynchronization;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionSynchronization;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 import javax.transaction.TransactionManager;

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java
index 68fafed..1291490 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.deployment.ejb30.ear.xmloverride;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless

appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java
index 279deaa..9d625ab 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/ear/xmloverride/ejb/SlessEJB.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class SlessEJB implements Sless

appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java
index 6c9ddc8..c46c3e2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb30/war/jsp/web/DummyEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.deployment.ejb30.web.jsp;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Remote({Dummy.class})

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
index 7d7cf27..d1df3f6 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/BarManagedBean.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 2e7f864..460a386 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import org.omg.CORBA.ORB;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
index 3e19563..b19027c 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
index 2fa8120..9308e5f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import org.omg.CORBA.ORB;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
index fd2c630..b72ac76 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -22,7 +22,7 @@
 import javax.interceptor.AroundInvoke;
 import java.util.Map;
 
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 public class InterceptorB extends InterceptorSuper {
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
index 77a2d3d..a4a80da 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
index 63d118e..394ffce 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/SingletonBean.java
@@ -23,13 +23,13 @@
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalBean;
 
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 @Singleton
 @LocalBean

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
index 6cb2e78..e5a3a6a 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.Stateful;
-import javax.ejb.*;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.*;
 import javax.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;

appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
index 4f94e2f..c52310f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
-import javax.ejb.*;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.*;
 import javax.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java
index 513eb5e..2fd69ce 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/AppScopedResources/CorrectEnterpriseApplication/ejbModule/gf/Invoker.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class Invoker {}

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
index 7ff9a57..bcac37b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker1.java
@@ -16,8 +16,8 @@
 
 package gf;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
index 2a11ffd..c7f5e33 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/Invoker2.java
@@ -16,8 +16,8 @@
 
 package gf;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
index 56ebe6c..c8aec0d 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
index d6ed501..4c96f15 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEJBRef/ejbModule/gf/MySLSB2.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker1.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java
index 3b38654..1c2dab7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflictedEnvEntry/ejbModule/gf/Invoker2.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker1.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java
index 3b38654..1c2dab7 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceEnvRef/ejbModule/gf/Invoker2.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
index 1b6a8b8..40f8a1f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker3.java
@@ -17,7 +17,7 @@
 package gf;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
index 55339fd..f64f516 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ConflitedResourceRef/ejbModule/gf/Invoker4.java
@@ -17,7 +17,7 @@
 package gf;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/CorrectEnvEntry/src/gf/Invoker1.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java
index 55a8ac7..f816484 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/Sless.java
@@ -16,7 +16,7 @@
 
 package test.ejb;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface Sless {

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java
index a156e2a..2e10d95 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/ejbModule/src/SlessEJB.java
@@ -17,7 +17,7 @@
 package test.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class SlessEJB implements Sless {

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java
index 2482a5e..03aa11f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/CorrectLocalRef/webModule/src/TestServlet.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java
index d2b59ee..4468ee2 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/ejbModule/src/SlessEJB.java
@@ -17,8 +17,8 @@
 package test.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 
 @Stateless(mappedName="sless_ejb")
 @Remote(Sless.class)

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java
index ad150ee..3eb2853 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/EJBRef/RemoteRef/webModule/src/TestServlet.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
index 883e242..cdd64fe 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/IncorrectEnvEntry/src/gf/Invoker1.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java
index 4e171ce..62b6a03 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectEnvProps/ejbModule/gf/Invoker.java
@@ -17,7 +17,7 @@
 package gf;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class Invoker {

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java
index 08f0c78..5c0693f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/CorrectQueueRes/src/gf/Invoker.java
@@ -16,7 +16,7 @@
 
 package gf;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.annotation.Resource;
 import jakarta.jms.QueueConnectionFactory;
 import jakarta.jms.Queue;

appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
index 77cb2af..4d8587e 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/ejb31/jndivalidation/ResourceRef/DefaultResources/src/gf/TestServlet.java
@@ -17,10 +17,10 @@
 package gf;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
-import javax.ejb.SessionContext;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.TimerService;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.MessageDrivenContext;
+import jakarta.ejb.TimerService;
 import javax.enterprise.concurrent.ContextService;
 import javax.enterprise.concurrent.ManagedExecutorService;
 import javax.enterprise.concurrent.ManagedScheduledExecutorService;

appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java
index de2ab72..524de7f 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjb.java
@@ -16,7 +16,7 @@
 
 package versionedejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SimpleVersionedEjb {

appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
index ed794a2..0024e71 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-ejb/src/SimpleVersionedEjbImpl.java
@@ -21,7 +21,7 @@
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful(name="SimpleVersionedEjb", mappedName="ejb/SimpleVersionedEjb")
 public class SimpleVersionedEjbImpl implements SimpleVersionedEjb {

appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/deployment/webservices/noinf/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
index 9d029b7..8928c70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java
index fa653d0..7001018 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/Driver.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
index 825a54c..252abd5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java
index afbb3ea..1440393 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/DriverHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface DriverHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java
index b1f8c84..9252323 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface HereLocal
     extends EJBLocalObject

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
index 210adc8..4696c14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java
index 004894e..abc592e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/HereLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HereLocalHome

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
index d849683..f0526f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntity.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
 import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
index b1ad197..b01c9a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
index 0373cd9..c73a23a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalEntityHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.EJBLocalHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface LocalEntityHome
     extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
index 0a88bb4..ea3e28e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/LocalStudent.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
 import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java
index b656d23..8beed1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface ThereRemote

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
index 1b5905d..85752f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java
index a1fa0a9..d669134 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/ctxcheck/ejb/ThereRemoteHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.ctxcheck;
 
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
index 73c1104..688f0b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java
index 5f93ecd..05061fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/Driver.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.remove;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
index cf5af89..774accc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverBean.java
@@ -19,10 +19,10 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.RemoveException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java
index 6ffad93..7f423fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/DriverHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface DriverHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java
index 10cfc82..970e1c8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.remove;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface HereLocal
     extends EJBLocalObject

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
index f4ec737..fd7c176 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java
index 3816e4c..69891bf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/allowedmethods/remove/ejb/HereLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.allowedmethods.remove;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HereLocalHome

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
index b8bc21a..825f577 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/descriptor/ejb-jar.xml
@@ -146,7 +146,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -201,7 +201,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -232,7 +232,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -295,7 +295,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -365,7 +365,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -414,7 +414,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -470,7 +470,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>
@@ -625,7 +625,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
index f055ae4..3c3b739 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Course.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.finder.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
index e41dc1d..daf34c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
index d6aad22..1e5b712 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/CourseHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.finder.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
 
 public interface CourseHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
index 02fd3d2..26bd031 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Enroller.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.finder.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Enroller extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
index 7cc5084..44292d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.finder.ejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java
index 07505f3..348f16a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.bmp.finder.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface EnrollerHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
index 9a62121..c0b4153 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.finder.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
index 3d6535d..3310d76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
index a7dcd69..4925aa9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/finder/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.finder.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
index f9273a1..d9222cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/descriptor/ejb-jar.xml
@@ -141,7 +141,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -196,7 +196,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -227,7 +227,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -290,7 +290,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -360,7 +360,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -409,7 +409,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -465,7 +465,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>
@@ -620,7 +620,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
index fab2b77..1907a65 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Course.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
index 1e6b23f..1687d68 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
index 687327a..d01c797 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/CourseHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
 
 public interface CourseHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
index 8b0fa42..0a580d4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Enroller.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Enroller extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
index 14fb3fa..5c9d7b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java
index bf10869..9898176 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface EnrollerHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
index 918464c..088eef4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
index d7e2d37..7367ef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
index ab165db..a255dca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/handle/mix/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.handle.mix.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
index 25513c1..2c87087 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/client/ReadOnlyClient.java
@@ -23,7 +23,7 @@
 import com.sun.s1asdev.ejb.bmp.readonly.ejb.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 /**
  * A simple java client will: 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
index 7b8c91f..a1921fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/descriptor/ejb-jar.xml
@@ -184,7 +184,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -239,7 +239,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -270,7 +270,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -333,7 +333,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -403,7 +403,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -453,7 +453,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -507,7 +507,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -557,7 +557,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -612,7 +612,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>
@@ -777,7 +777,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>
@@ -872,7 +872,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>NotSupported</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
index 4657bf6..e75ee64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Course.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
index 785a4be..f59e86b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
index ad0f63b..a75e2df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/CourseHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
 
 public interface CourseHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
index 443a2e3..48f0fd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Enroller.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Enroller extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
index 220365d..e1d41cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java
index 2fee447..41e0ec6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface EnrollerHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
index bce2a42..0e508b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
index d306d1d..245d425 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
index f8298ca..5b8c498 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java
index 018b3fe..09d307c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentHomeMutable.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHomeMutable extends StudentHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
index 19accfa..7d2fd28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocal.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface StudentLocal extends EJBLocalObject {
  

appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
index 43a42dc..c79588f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/readonly/ejb/StudentLocalHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.bmp.readonly.ejb;
 
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.EJBLocalHome;
 
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentLocalHome extends EJBLocalHome {
 

appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java
index 230daf6..34fd4ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
index 8ea7c06..b5eb26d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java
index 83afc02..7f6b502 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java
index ee97ea3..fb6a836 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/Test.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface Test extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
index 67b2194..029a59b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestBMP.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java
index f4cc549..103f42f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/simple_nopackage/ejb/TestHome.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface TestHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java
index 230daf6..34fd4ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
index 8ea7c06..b5eb26d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java
index 83afc02..7f6b502 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/thread_pool_id/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java
index 0525d65..a541bd4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
index b174652..6326b5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java
index fa93d6f..0ea7b0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java
index f62ea74..6791857 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/Stateless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface Stateless

appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
index 04c75ed..3cc403e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java
index af9b4bf..d45e67e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/twolevel/ejb/StatelessHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.twolevel.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface StatelessHome

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java
index c587d19..a7379bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
index 8ef8236..e171eab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java
index c1f6e00..40b9391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/simple/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
index b1f91aa..f28da27 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb.SLSBHome;

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
index 8192557..65d066a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SLSB
     extends EJBObject

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
index ad41ba3..2ddf9ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import com.sun.s1asdev.ejb.bmp.txtests.simple.ejb.SimpleBMPHome;
 import com.sun.s1asdev.ejb.bmp.txtests.simple.ejb.SimpleBMP;

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
index ab95eeb..9c332eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SLSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.bmp.txtests.stateless.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SLSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java
index c587d19..a7379bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java
index c1f6e00..40b9391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/bmp/txtests/stateless/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp.txtests.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
index 9ceee79..4b94bf3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java
index 6a97929..b0c41ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.classload.lifecycle;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
index 8f96176..a92bc1b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java
index 7d907e3..43b44a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/classload/lifecycle/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
index 52da57d..2671c71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Stateless
 public class MyBean implements MyBeanRemoteIntf {

appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
index d47627e..c975953 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cli/negative/ejb/MyBeanRemoteIntf.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Remote
 public interface MyBeanRemoteIntf {

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
index f7ca573..b5b7e32 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Bean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public class A1Bean implements javax.ejb.EntityBean {
+public class A1Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A1Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -87,14 +87,14 @@
     public java.lang.String id;
     public java.lang.String name;
 
-    public java.lang.String ejbCreate(java.lang.String id) throws javax.ejb.CreateException {
+    public java.lang.String ejbCreate(java.lang.String id) throws jakarta.ejb.CreateException {
 
         this.id = id;
         name = "ABC";
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String id) throws javax.ejb.CreateException { 
+    public void ejbPostCreate(java.lang.String id) throws jakarta.ejb.CreateException { 
     }
 
     public void setName(String s) {

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
index ae43b72..bd56f6d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1Local.java
@@ -16,13 +16,13 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1Local extends javax.ejb.EJBLocalObject {
+public interface A1Local extends jakarta.ejb.EJBLocalObject {
 
     public void setName(String name); 
 

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
index e6fdaf5..9057982 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A1LocalHome.java
@@ -16,17 +16,17 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1LocalHome extends javax.ejb.EJBLocalHome {
+public interface A1LocalHome extends jakarta.ejb.EJBLocalHome {
     
-    public  A1Local findByPrimaryKey(java.lang.String pk)  throws javax.ejb.FinderException;
+    public  A1Local findByPrimaryKey(java.lang.String pk)  throws jakarta.ejb.FinderException;
     
-    public  A1Local create(java.lang.String id) throws javax.ejb.CreateException;
+    public  A1Local create(java.lang.String id) throws jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
index a9e34f3..28cc6b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Bean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public abstract class A2Bean implements javax.ejb.EntityBean {
+public abstract class A2Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A2Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -90,14 +90,14 @@
     public abstract java.lang.String getName() ;
     public abstract void setName(java.lang.String s) ;
 
-    public java.lang.String ejbCreate(java.lang.String id) throws javax.ejb.CreateException {
+    public java.lang.String ejbCreate(java.lang.String id) throws jakarta.ejb.CreateException {
 
         setId(id);
         setName("ABC");
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException { 
+    public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException { 
     }
 
     public void setNameWithFlush(java.lang.String s) {

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
index c4108c3..0cbc08f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2Local.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2Local extends javax.ejb.EJBLocalObject {
+public interface A2Local extends jakarta.ejb.EJBLocalObject {
 
     public void setName(String name); 
  

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
index 3ca6e66..739003c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/A2LocalHome.java
@@ -16,17 +16,17 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2LocalHome extends javax.ejb.EJBLocalHome {
+public interface A2LocalHome extends jakarta.ejb.EJBLocalHome {
     
-    public  A2Local findByPrimaryKey(java.lang.String pk)  throws javax.ejb.FinderException;
+    public  A2Local findByPrimaryKey(java.lang.String pk)  throws jakarta.ejb.FinderException;
     
-    public  A2Local create(java.lang.String name) throws javax.ejb.CreateException;
+    public  A2Local create(java.lang.String name) throws jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
index 8353902..e436599 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/Test.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface Test extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
index 3cddc82..68162d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejbflush;
 
 import javax.naming.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class TestBean implements SessionBean {
 

appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
index 1429ed5..4e903cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/ejbflushwithsqlexception/ejb/TestHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbflush;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface TestHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
index e2f8743..bfa035c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/descriptor/ejb-jar-customer.xml
@@ -154,7 +154,7 @@
         <method-intf></method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -254,7 +254,7 @@
         <method-intf></method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
     </method-permission>

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
index c36a034..fa37d56 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
index 06dbbc8..f9c6a10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface CustomerHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java
index d7001a1..28bd5c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocal.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface CustomerLocal extends EJBLocalObject {
     public String getId();

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
index d1419d5..5d0c2bb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerLocalHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface CustomerLocalHome extends EJBLocalHome {
     

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java
index 64cfabf..5abd5b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/CustomerRemote.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface CustomerRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
index de2aae0..38e2294 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 public abstract class ItemBean implements EntityBean {

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
index ad0e296..1061db6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface ItemHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
index a20157b..beecd09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocal.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface ItemLocal extends EJBLocalObject, java.io.Serializable {
     public String getId();

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
index 5a9c618..06c57cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemLocalHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface ItemLocalHome extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
index 8001e75..4656e05 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/preselect/customer/ejb/ItemRemote.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.preselect.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface ItemRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
index e7d8892..0547214 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/client/ReadOnlyClient.java
@@ -23,8 +23,8 @@
 import com.sun.s1asdev.ejb.cmp.readonly.ejb.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
-import javax.ejb.EJBException;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.CreateException;
 import java.rmi.RemoteException;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java
index 79ca5fd..96dec44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.cmp.readonly.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
index 8e49ba0..88f7fe6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
index 3615135..29b022d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.cmp.readonly.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
index e1f2d27..555eed5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocal.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.cmp.readonly.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface StudentLocal extends EJBLocalObject {
  

appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
index 105db34..59b6166 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/cmp/readonly/ejb/StudentLocalHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.cmp.readonly.ejb;
 
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.EJBLocalHome;
 
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentLocalHome extends EJBLocalHome {
 

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java
index 0006085..3149f59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/CheckpointedBean.java
@@ -24,11 +24,11 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java
index d54fc30..af81959 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/src/java/net/max/ee/sfsb/SimpleShoppingCartBean.java
@@ -25,9 +25,9 @@
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
index 2c55c94..bd1e4ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 import com.sun.s1asdev.ejb.ee.ejb.SFSBHome;
 import com.sun.s1asdev.ejb.ee.ejb.SFSB;

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
index e0a80f7..69b1e1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
index 6cae113..4ab6beb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
index 92834b9..f623efb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/multi/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ee.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
index fdba62a..b420d80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.ee.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
index 8841227..cbfd931 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
index 0fd1163..d9bd214 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
index 1d939b3..a3f4a97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/methodcheckpoint/simple/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ee.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java
index 19d94a1..70480c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/MyBean.java
@@ -23,7 +23,7 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
index d11e41f..ec1cf70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/autotimer/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java
index f676e24..0f7cb35 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/CreateTimersBean.java
@@ -20,10 +20,10 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.Singleton;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
 
 @Singleton
 public class CreateTimersBean implements TimedObject {

appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java
index 6d63d1b..79ec67e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/cli/src/eetimer/StartupSingletonBean.java
@@ -17,9 +17,9 @@
 package eetimer;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 @Singleton
 @Startup()

appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java
index b8a68ae..406a27b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.util.Collection;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
index dde8ad8..38128dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/domaindeployment/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java
index f0ea46e..fcf2ec1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/MyBean.java
@@ -23,7 +23,7 @@
 
 import java.util.Collection;
 import java.util.HashSet;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
index d11e41f..ec1cf70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/failover/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java
index 621c41b..dd2de94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/SgltTimerBean.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 @Singleton

appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java
index a7f004a..72cf2c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/StlesTimerBean.java
@@ -17,15 +17,15 @@
 package com.acme;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Schedule;
-import javax.ejb.ScheduleExpression;
-import javax.ejb.Schedules;
-import javax.ejb.Singleton;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerConfig;
-import javax.ejb.TimerService;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.ScheduleExpression;
+import jakarta.ejb.Schedules;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerConfig;
+import jakarta.ejb.TimerService;
 import java.util.HashSet;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
index 5524c86..dfbd976 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/timer/getalltimers/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
index a601ace..12edff9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.ee.ejb.BMTSessionHome;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
index 16d22db..8b8837d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BMTSession

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
index fcd7774..91ad222 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
index 60183bc..5af1269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/BMTSessionHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ee.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface BMTSessionHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
index 99e8807..8105e44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface CMTSession

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
index 895dec3..c7c26b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
index a4077df..1b72c60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmtcmttx/ejb/CMTSessionHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ee.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface CMTSessionHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
index 2c85d8b..1b3aea0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.ee.ejb.BMTSessionHome;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
index 4ea96de..117d1cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BMTSession

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
index 3d84d20..71cb378 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ee.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
index 60183bc..5af1269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/bmttx/ejb/BMTSessionHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ee.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface BMTSessionHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
index 7b60351..e3917bf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
index 6d25f9f..50288b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
index 057e53c..9ac0024 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
index a1a9d32..82a15e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ee/txcheckpoint/simpletx/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ee.txcheckpoint.simpletx.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
index a0e5226..8f45ca5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejb.devtest.Sless;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java
index 2c46291..90ab392 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTOperation.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface BMTOperation

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java
index b81a065..6e26eff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/BMTSfulBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Stateful;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java
index 2d8f938..e80b430 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTOperation.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface CMTOperation

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java
index f040b87..1fc8e49 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/CMTSfulBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.naming.InitialContext;
 
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java
index fd4f15a..1e24b90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Operation.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface Operation {

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java
index 21d58bf..fbe66a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
index 9cf6de2..d26cd03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/allowed/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class SlessBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
index a8061f1..a9a712c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import org.omg.CORBA.ORB;
 import com.sun.s1asdev.ejb.ejb30.clientview.adapted.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
index 958017c..c5c7ae2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Common.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Common 
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java
index 05a1566..2d83c26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java
index 8237321..8fb2e38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyEJBRemoteSless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java
index 91b7681..ad078a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface DummyRemote
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java
index 7d13ee7..fe95199 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummyRemote2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface DummyRemote2
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java
index a9ea221..7a2740f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface DummySlessRemote
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java
index 1039368..a691c25 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/DummySlessRemote2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface DummySlessRemote2
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
index 1ff1099..55b0525 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 // Remote business interface
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
index c9905ec..17e540b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java
index 3ef3a6e..7855dbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sful extends Common, EJBLocalObject
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
index f4d40f2..0e03859 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 import jakarta.annotation.PreDestroy;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java
index dafb9fb..335b34b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface SfulHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
index a0d6cf2..c1507c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SfulRemote extends CommonRemote, EJBObject
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java
index 9588494..17970ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface SfulRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java
index 6bb240a..e891701 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sless extends Common, EJBLocalObject
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
index 1c7de62..c04e8da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 import javax.transaction.TransactionManager;
 import javax.transaction.Status;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java
index 0fffc14..909673c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessHome extends EJBLocalHome
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java
index cf8d7fd..4d6225f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessRemote extends CommonRemote, EJBObject
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java
index 181ce6c..95bbd95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/adapted/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.adapted;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface SlessRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
index f4d3538..414604d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.InitialContext;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import org.omg.CORBA.ORB;
 import com.sun.s1asdev.ejb.ejb30.clientview.core.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -123,7 +123,7 @@
         try {
             h.throwAppException1();
             throw new Exception("didn't get exception for testException2");
-        } catch(javax.ejb.FinderException e) {
+        } catch(jakarta.ejb.FinderException e) {
             System.out.println("Successfully caught exception " + 
                                e.getClass() + " " + e.getMessage());
         }
@@ -131,7 +131,7 @@
         try {
             h.throwAppException2();
             throw new Exception("didn't get exception for testException3");
-        } catch(javax.ejb.FinderException e) {
+        } catch(jakarta.ejb.FinderException e) {
             System.out.println("Successfully caught exception " + 
                                e.getClass() + " " + e.getMessage());
         }

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java
index 4b78c52..2108358 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Bmp.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Bmp extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
index b03f582..db989ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class BmpEJB implements EntityBean
 {
@@ -77,12 +77,12 @@
 
     // throws some checked exception which is a subclass of the declared
     // checked exception
-    public void testException3() throws javax.ejb.FinderException {
+    public void testException3() throws jakarta.ejb.FinderException {
         throw new ObjectNotFoundException("testException3");
     }
 
     // throws some checked exception
-    public void testException4() throws javax.ejb.FinderException {
+    public void testException4() throws jakarta.ejb.FinderException {
         throw new FinderException("testException4");
     }
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
index d2258e5..244fe3e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface BmpHome extends BmpHomeSuper

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java
index 5557c80..c36315e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpHomeSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface BmpHomeSuper extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java
index 91f38cc..a47c638 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BmpRemote extends CommonRemote

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
index 9c7f337..a9c4baa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BmpRemoteHome extends BmpRemoteHomeSuper

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java
index 4507e9d..e94e1cf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/BmpRemoteHomeSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BmpRemoteHomeSuper extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java
index 6c78eb2..0e3364c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Common.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Common extends EJBLocalObject
 {
@@ -42,5 +42,5 @@
     void testException2();
 
     // throws some checked exception
-    void testException3() throws javax.ejb.FinderException;
+    void testException3() throws jakarta.ejb.FinderException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java
index 6e965bc..69853b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/CommonRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface CommonRemote extends EJBObject
@@ -43,9 +43,9 @@
     void testException2() throws RemoteException;
 
     // throws some checked exception
-    void testException3() throws javax.ejb.FinderException, RemoteException;
+    void testException3() throws jakarta.ejb.FinderException, RemoteException;
 
-    void testException4() throws javax.ejb.FinderException, RemoteException;
+    void testException4() throws jakarta.ejb.FinderException, RemoteException;
 
 
     void testPassByRef1(int a) throws RemoteException;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java
index be474af..894929c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 // Remote business interface
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
index 341fc94..457780f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java
index 6d077eb..4a9d3ad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sful extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
index 6c6e98f..1520c06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
@@ -76,12 +76,12 @@
 
     // throws some checked exception which is a subclass of the declared
     // checked exception
-    public void testException3() throws javax.ejb.FinderException {
+    public void testException3() throws jakarta.ejb.FinderException {
         throw new ObjectNotFoundException("testException3");
     }
 
     // throws some checked exception
-    public void testException4() throws javax.ejb.FinderException {
+    public void testException4() throws jakarta.ejb.FinderException {
         throw new FinderException("testException4");
     }
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java
index 8449eef..2c4e502 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface SfulHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java
index 4a1d905..daa030f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SfulRemote extends CommonRemote
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java
index 7e2a06a..a891073 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SfulRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java
index 2785c8c..7fe2f25 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sless extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
index 2d33a79..303abf5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class SlessEJB implements SessionBean
 {
@@ -60,13 +60,13 @@
 
     // throws some checked exception which is a subclass of the declared
     // checked exception
-    public void testException3() throws javax.ejb.FinderException {
+    public void testException3() throws jakarta.ejb.FinderException {
         throw new ObjectNotFoundException("testException3");
     }
 
     // throws some checked exception
-    public void testException4() throws javax.ejb.FinderException {
-        throw new javax.ejb.FinderException("testException4");
+    public void testException4() throws jakarta.ejb.FinderException {
+        throw new jakarta.ejb.FinderException("testException4");
     }
 
     public void testPassByRef1(int a) {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java
index 90e1b94..f4e801b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessHome extends EJBLocalHome
 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java
index 959a06f..e0ef1fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessRemote extends CommonRemote
 {}

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java
index be4ddab..9845cc1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/core/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.core;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SlessRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
index abcab55..a527d9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import javax.transaction.TransactionRequiredException;
 import com.sun.s1asdev.ejb.ejb30.clientview.exceptions.*;
@@ -138,7 +138,7 @@
 		sleepFor(5);
 		sfulRemoteBusiness.ping();
 		stat.addStatus("local concurrentAccess[1.1]", stat.FAIL);
-	    } catch (javax.ejb.ConcurrentAccessException conEx) {
+	    } catch (jakarta.ejb.ConcurrentAccessException conEx) {
 		stat.addStatus("local concurrentAccess[1.1]", stat.PASS);
 	    } catch (Throwable th) {
 		System.out.println("Argggggg: Got: " + th);

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java
index d2d9d8b..77c558d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 // Remote business interface
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
index 8cf924e..752648a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java
index 18ece9a..a7d0d6b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RollbackAppException.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.ApplicationException;
+import jakarta.ejb.ApplicationException;
 
 @ApplicationException(rollback=true)
 public class RollbackAppException extends RuntimeException

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java
index 52eb30d..92b4956 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/RuntimeAppException.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.ApplicationException;
+import jakarta.ejb.ApplicationException;
 
 @ApplicationException
 public class RuntimeAppException extends RuntimeException

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java
index 000451b..1ed2020 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulBusiness.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface SfulBusiness

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
index 25cf9f0..38f6354 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.security.DenyAll;

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
index db414c5..6c32446 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SfulRemoteBusiness 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java
index d010fef..ec478c6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SfulRemoteBusiness2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.rmi.RemoteException;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java
index b407160..f221785 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.DenyAll;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
index 0461dc4..6dadb35 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.clientview.exceptions;
 
 // Remote business interface
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SlessRemoteBusiness 

appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java
index 49b6647..fd9b7f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/clientview/exceptions/ejb/SlessRemoteBusiness2.java
@@ -18,7 +18,7 @@
 
 // Remote business interface
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.rmi.RemoteException;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
index 4374619..6e258c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.InitialContext;
 
 import com.sun.s1asdev.ejb.ejb30.ee.local_sfsb.*;

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
index 08d6aa4..d67e10c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 	
 @Local
 public interface Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java
index 0cefe2d..3ed52c2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriver.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SfulDriver {

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
index 5de200b..069647e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulDriverEJB.java
@@ -16,11 +16,11 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateful;
 import javax.naming.InitialContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful(mappedName="AAbbCCejb/SfulLocalRemoteRef")
 @EJB(name="ejb/Sful", beanInterface=Sful.class)

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
index 2db6361..c0649cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
 
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulEJB

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
index 9393888..beeeefc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/local_sfsb/ejb/SfulGreeter.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.local_sfsb;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 	
 @Local
 public interface SfulGreeter

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
index ea4d23f..b5d0211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.InitialContext;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java
index 0f8c053..a0954df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulDriver.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SfulDriver {

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java
index a0a8616..2e3f443 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxy.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_client;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SfulProxy {

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
index 987109c..ae40678 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_client/ejb/SfulProxyEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_client;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.naming.InitialContext;
 
 import com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb.SfulDriver;

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
index a54ae1c..e28c97f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import java.net.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.InitialContext;
 
 import com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb.*;

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
index 66076f9..b150800 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface RemoteSful

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
index f5b3a99..47fa04c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/RemoteSfulEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
 
-import javax.ejb.Stateful;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 	
 @Stateful
 public class RemoteSfulEJB

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java
index 0f8c053..a0954df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriver.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SfulDriver {

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
index 00d43d4..e5c4c90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulDriverEJB.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Stateful;
 import javax.naming.InitialContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful(mappedName="jndi_SfulDriver")
 @EJBs({

appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java
index 5d50986..7c28509 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/ee/remote_sfsb/ejb/SfulFacade.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.ee.remote_sfsb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SfulFacade {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
index 124e4aa..6ee11e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/client/Client.java
@@ -18,8 +18,8 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.Handle;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Handle;
 import com.sun.s1asdev.ejb.ejb30.hello.dcode.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java
index 84decc3..5a6a2d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.dcode;
 
-public interface Sful extends javax.ejb.EJBObject
+public interface Sful extends jakarta.ejb.EJBObject
 {
     public String hello() throws java.rmi.RemoteException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
index 54252ad..c02a3c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulEJB.java
@@ -16,11 +16,11 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.dcode;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Init;
-import javax.ejb.RemoteHome;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Init;
+import jakarta.ejb.RemoteHome;
 
 @RemoteHome(SfulHome.class)
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java
index 2ea5b7f..c80fcd7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SfulHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.dcode;
 
-public interface SfulHome extends javax.ejb.EJBHome
+public interface SfulHome extends jakarta.ejb.EJBHome
 {
-    public Sful create() throws javax.ejb.CreateException, java.rmi.RemoteException;
+    public Sful create() throws jakarta.ejb.CreateException, java.rmi.RemoteException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java
index 5997572..325c0cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/Sless.java
@@ -22,7 +22,7 @@
 {
     public String hello();
 
-    public String hello2() throws javax.ejb.CreateException;
+    public String hello2() throws jakarta.ejb.CreateException;
 
     public String getId();
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java
index 2dc2050..35e3051 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-public interface SlessRemote extends javax.ejb.EJBObject
+public interface SlessRemote extends jakarta.ejb.EJBObject
 {
     public String hello() throws java.rmi.RemoteException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java
index 723e5b5..93c1efd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/dcode/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-public interface SlessRemoteHome extends javax.ejb.EJBHome
+public interface SlessRemoteHome extends jakarta.ejb.EJBHome
 {
-    public SlessRemote create() throws javax.ejb.CreateException, java.rmi.RemoteException;
+    public SlessRemote create() throws jakarta.ejb.CreateException, java.rmi.RemoteException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
index d5f8a6d..bad36a1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import jakarta.jms.*;
 import jakarta.annotation.Resource;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
index 0da02f9..144ea80 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
 
 // Hello1 interface is not annotated with @Local. If the

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
index 8f91a35..cf45901 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 // Hello1 interface is not annotated with @Local. If the
 // bean only implements one interface it is assumed to be

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
index ddd4c47..75a6c3d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb/ejb/MessageBean.java
@@ -16,13 +16,13 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
 
 import jakarta.jms.MessageListener;
 import jakarta.jms.Message;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
index ede2602..7afd2b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateful.java
@@ -16,16 +16,16 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
 
-import javax.ejb.Stateful;
-import javax.ejb.Local;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import javax.naming.InitialContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 @Local({Hello2.class})
-@Stateful public class HelloStateful implements Hello2, javax.ejb.SessionBean {
+@Stateful public class HelloStateful implements Hello2, jakarta.ejb.SessionBean {
 
     private String msg;
 
@@ -44,7 +44,7 @@
     }
     */
 
-    public void setSessionContext(javax.ejb.SessionContext sc) {
+    public void setSessionContext(jakarta.ejb.SessionContext sc) {
         System.out.println("In HelloStateful:setSessionContext");
         try {
             SessionContext sc2 = (SessionContext) 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
index baccc45..c1b8391 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStateless.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
 
-import javax.ejb.Stateless;
-import javax.ejb.TimerService;
-import javax.ejb.Local;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Local;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 @Local({Hello1.class})
 @Stateless public class HelloStateless extends HelloStatelessSuper implements Hello1 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
index 5f5c3c1..0493b03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/HelloStatelessSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.TransactionManager;
 import javax.transaction.Status;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
index a593f05..aec028a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/mdb2/ejb/MessageBean.java
@@ -16,18 +16,18 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.mdb2;
 
-import javax.ejb.MessageDriven;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenContext;
 
 import javax.naming.InitialContext;
 
@@ -48,7 +48,7 @@
 
 @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
 @MessageDriven(messageListenerInterface=MessageListener.class) 
-public class MessageBean implements javax.ejb.MessageDrivenBean {
+public class MessageBean implements jakarta.ejb.MessageDrivenBean {
 
     @EJB(name="hello1") private Hello1 hello1;
     @EJB private Hello2 hello2;
@@ -56,8 +56,8 @@
     boolean onMessageInterceptorCalled = false;
     boolean timeoutInterceptorCalled = false;
 
-    @Resource javax.ejb.MessageDrivenContext ctx;
-    @Resource javax.ejb.TimerService injectedTimerService;
+    @Resource jakarta.ejb.MessageDrivenContext ctx;
+    @Resource jakarta.ejb.TimerService injectedTimerService;
 
     @Resource(name="jms/MyQueueConnectionFactory") 
         QueueConnectionFactory qcFactory;
@@ -94,7 +94,7 @@
     }
 
     @Resource
-    private void setMDC(javax.ejb.MessageDrivenContext context) {
+    private void setMDC(jakarta.ejb.MessageDrivenContext context) {
 
         try {
             context.getTimerService();
@@ -107,7 +107,7 @@
 
     }
 
-    public void setMessageDrivenContext(javax.ejb.MessageDrivenContext mdc) {
+    public void setMessageDrivenContext(jakarta.ejb.MessageDrivenContext mdc) {
         System.out.println("In MDB:setMessageDrivenContext");
     }
 
@@ -220,7 +220,7 @@
     }
 
 
-    @Timeout private void timeout(javax.ejb.Timer t) {
+    @Timeout private void timeout(jakarta.ejb.Timer t) {
 
         QueueConnection connection = null;        
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
index deb56bc..ff4ad8f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/client/Client.java
@@ -16,7 +16,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
index 0c7a132..2c4073c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sful.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java
index 157b1b0..d55a0ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SfulEJB.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful
 public class SfulEJB implements Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java
index 6341516..0f1e8f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/Sless.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java
index 3f3d333..98eef03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/nopkg/ejb/SlessEJB.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class SlessEJB implements Sless

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
index 9f89212..410c711 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.InitialContext;
 import com.sun.s1asdev.ejb.ejb30.hello.session.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
index 896d72f..80af5ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java
index acb4650..d3599e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful
 public class SfulEJB implements Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java
index 3f23982..848e2ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java
index 2d0d0b5..a0e0f33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session/ejb/SlessEJB.java
@@ -16,13 +16,13 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class SlessEJB implements Sless
 {
 
-    @jakarta.annotation.Resource javax.ejb.TimerService ts;
+    @jakarta.annotation.Resource jakarta.ejb.TimerService ts;
 
     public String hello() {
         System.out.println("In SlessEJB:hello()");

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
index 20991b5..e556394 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/Client.java
@@ -18,11 +18,11 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.EJBs;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJBTransactionRequiredException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJBTransactionRequiredException;
 import javax.naming.InitialContext;
 import javax.naming.Context;
 import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
@@ -225,7 +225,7 @@
             try {
                 sless1.hello2();
                 throw new Exception("Did not receive CreateException");
-            } catch(javax.ejb.CreateException ce) {
+            } catch(jakarta.ejb.CreateException ce) {
                 System.out.println("Successfully caught app exception");
             }
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java
index d728a3b..adaaf7f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/client/ClientSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session2.*;
 
 public class ClientSuper {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
index 68bba90..d89469d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java
index e90831c..587c29d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
index e6c1984..29fe7ca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/MyCallbackHandler.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.PreDestroy;
 import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 public class MyCallbackHandler {
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
index 35e7471..a42c24c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sful2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful2

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
index 9f6a436..da9d18c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB.java
@@ -16,18 +16,18 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.naming.InitialContext;
 
 import jakarta.annotation.Resource;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
index d368bb9..0b431e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SfulEJB2.java
@@ -16,19 +16,19 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 import javax.interceptor.Interceptors;
-import javax.ejb.EJBs;
-import javax.ejb.Remove;
-import javax.ejb.SessionSynchronization;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.Remove;
+import jakarta.ejb.SessionSynchronization;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.naming.InitialContext;
 
 import jakarta.annotation.Resource;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java
index 5997572..325c0cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/Sless.java
@@ -22,7 +22,7 @@
 {
     public String hello();
 
-    public String hello2() throws javax.ejb.CreateException;
+    public String hello2() throws jakarta.ejb.CreateException;
 
     public String getId();
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
index 7c4a4dd..21c699c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
-import javax.ejb.EJB;
-import javax.ejb.RemoteHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.RemoteHome;
+import jakarta.ejb.CreateException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -51,8 +51,8 @@
         return "hello from SlessEJB";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     public String getId() {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
index 8b01cd2..4a85608 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB2.java
@@ -16,15 +16,15 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionBean;
-import javax.ejb.CreateException;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;
@@ -64,8 +64,8 @@
         return "hello from SlessEJB2";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     @TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
index 098a718..09811f3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessEJB3.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
-import javax.ejb.EJB;
-import javax.ejb.EJBContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBContext;
 import jakarta.annotation.PostConstruct;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 import java.util.Collection;
@@ -39,7 +39,7 @@
 
     private @Resource SessionContext ejbContext2;
 
-    @Resource(type=javax.ejb.SessionContext.class) 
+    @Resource(type=jakarta.ejb.SessionContext.class) 
     private EJBContext ejbContext3;
 
     private EJBContext ejbContext4;
@@ -74,7 +74,7 @@
     }
 
     private EJBContext ejbContext6;
-    @Resource(type=javax.ejb.SessionContext.class)
+    @Resource(type=jakarta.ejb.SessionContext.class)
         private void setEJBContext6(EJBContext context) {
         ejbContext6 = context;
     }
@@ -101,8 +101,8 @@
         return "hello from sless ejb3";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     public String hello3() {
@@ -119,7 +119,7 @@
         if( get1.equals(get2) ) {
             System.out.println("get1 =" + get1);
             System.out.println("get2 =" +  get2);
-            throw new javax.ejb.EJBException("SFSB get test failed");
+            throw new jakarta.ejb.EJBException("SFSB get test failed");
         }
 
         return "hello3()";

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java
index 2dc2050..35e3051 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-public interface SlessRemote extends javax.ejb.EJBObject
+public interface SlessRemote extends jakarta.ejb.EJBObject
 {
     public String hello() throws java.rmi.RemoteException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java
index 723e5b5..93c1efd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2;
 
-public interface SlessRemoteHome extends javax.ejb.EJBHome
+public interface SlessRemoteHome extends jakarta.ejb.EJBHome
 {
-    public SlessRemote create() throws javax.ejb.CreateException, java.rmi.RemoteException;
+    public SlessRemote create() throws jakarta.ejb.CreateException, java.rmi.RemoteException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
index 0e729bb..2e687b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.NoSuchEJBException;
+import jakarta.ejb.NoSuchEJBException;
 import javax.naming.InitialContext;
 import javax.naming.Context;
 import com.sun.s1asdev.ejb.ejb30.hello.session2full.*;
@@ -185,7 +185,7 @@
             try {
                 sless1.hello2();
                 throw new Exception("Did not receive CreateException");
-            } catch(javax.ejb.CreateException ce) {
+            } catch(jakarta.ejb.CreateException ce) {
                 System.out.println("Successfully caught app exception");
             }
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
index d8b67cc..6218d31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2full;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java
index 0712ddb..5115563 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
index 5c4aedf..5b5f352 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2full;
 
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
 import javax.naming.InitialContext;
 
 import javax.transaction.UserTransaction;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java
index a6c1801..0eda3da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/Sless.java
@@ -22,7 +22,7 @@
 {
     public String hello();
 
-    public String hello2() throws javax.ejb.CreateException;
+    public String hello2() throws jakarta.ejb.CreateException;
 
     public String getId();
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
index 8dfb837..26c8c37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2full;
 
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -31,8 +31,8 @@
         return "hello from SlessEJB";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     public String getId() {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
index e455b87..3811751 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB2.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2full;
 
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.CreateException;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionContext;
 
 import javax.naming.InitialContext;
 import javax.transaction.TransactionManager;
@@ -46,8 +46,8 @@
         return "hello from SlessEJB2";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     public String getId() {

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
index 6a11cc1..5bc4362 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session2full/ejb/SlessEJB3.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session2full;
 
-import javax.ejb.EJBContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBContext;
+import jakarta.ejb.SessionContext;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -62,8 +62,8 @@
         return "hello from sless ejb3";
     }
 
-    public String hello2() throws javax.ejb.CreateException {
-        throw new javax.ejb.CreateException();
+    public String hello2() throws jakarta.ejb.CreateException {
+        throw new jakarta.ejb.CreateException();
     }
 
     public String hello3() {
@@ -80,7 +80,7 @@
         if( get1.equals(get2) ) {
             System.out.println("get1 =" + get1);
             System.out.println("get2 =" +  get2);
-            throw new javax.ejb.EJBException("SFSB get test failed");
+            throw new jakarta.ejb.EJBException("SFSB get test failed");
         }
 
         return "hello3()";

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
index 7dcc554..0ac9fe6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.PersistenceUnit;
@@ -61,13 +61,13 @@
                     ic.lookup("java:comp/env/myem");
                 
             } catch(Exception e) {
-                throw new javax.ejb.EJBException(e);
+                throw new jakarta.ejb.EJBException(e);
             }
             
 
             System.out.println("HelloEJB successful injection of EMF/EM references!");
         } else {
-            throw new javax.ejb.EJBException("One or more EMF/EM references" +
+            throw new jakarta.ejb.EJBException("One or more EMF/EM references" +
                                              " was not injected in HelloEJB");
         }
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
index 07b3756..e2d34ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/ejb/HelloStatefulEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session3;
 
-import javax.ejb.Stateful;
-import javax.ejb.AccessTimeout;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.AccessTimeout;
 import jakarta.annotation.PostConstruct;
 
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
index 7b0fc79..a82863b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session3/servlet/Servlet.java
@@ -22,9 +22,9 @@
 import javax.servlet.http.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.Resource;
 import jakarta.annotation.Resources;
 import javax.sql.DataSource;
@@ -201,7 +201,7 @@
 		sleepFor(10);
 		helloStateful2.ping();
 		throw new EJBException("Did not get ConcurrentAccessException");
-	    } catch (javax.ejb.ConcurrentAccessException conEx) {
+	    } catch (jakarta.ejb.ConcurrentAccessException conEx) {
 		System.out.println("Got expected ConcurrentAccessException");   //Everything is fine
 	    } catch (Throwable th) {
 		throw new EJBException("Got some wierd exception: " + th);

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
index 8e88c4c..f8720f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.InitialContext;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session4.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
index 112764e..26440ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session4;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java
index ebef907..f47f50c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/Sful2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session4;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful2

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
index 5b5e53f..37493fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session4;
 
-import javax.ejb.Stateful;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 @Stateful(mappedName="ejb_ejb30_hello_session4_Sful")

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
index 5377da1..29f0c73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session4/ejb/SlessEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session4;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
 
 // Use @Remote without parameters.  If there's only one ambiguous
 // interface in implements clause, it will be treate as @Remote instead of

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
index c6fd110..9cd7fa2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session5.Sful2;
 import com.sun.s1asdev.ejb.ejb30.hello.session5.Sless2;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
index 300f61e..9252fc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SfulEJB.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session5;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
 import javax.interceptor.Interceptors;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @Remote({Sful.class, Sful2.class})

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java
index ce2f7f5..bc5cfe2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session5/ejb/SlessEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session5;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
 
 @Stateless(mappedName="ejb_ejb30_hello_session5_Sless")
 @Remote({Sless.class, Sless2.class})

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
index 3d531da..ef1eb88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session_standalone.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java
index 6e00a15..e70a97c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session_standalone;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
 
 @Stateful
 @Remote({Sful.class})

appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
index d820759..24adcc2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/hello/session_standalone/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session_standalone;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
index cd418c3..33fa70a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.interceptors.bindings.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
index 79f1061..f9dd39e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Common.java
@@ -20,7 +20,7 @@
 import java.util.LinkedList;
 
 import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 public class Common {
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
index 64723e6..e53f28f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/InterceptorA.java
@@ -20,7 +20,7 @@
 import javax.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 import javax.naming.InitialContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 public class InterceptorA {

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
index 3fe665d..42b3e1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
index f66344c..3a12684 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sful2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sful2

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
index c634356..aac4548 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB.java
@@ -17,13 +17,13 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @Interceptors({InterceptorC.class, InterceptorD.class})

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
index 948b7a7..45b3a10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SfulEJB2.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
index 5a8bb4b..8622ee3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless3.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless3

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
index a7e5304..c8e3911 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless4.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless4

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
index 01566c4..7d24ce3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless5.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless5

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
index 60fd9d5..8993276 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/Sless6.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless6

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
index c0d28ea..e07b46a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB3.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
index bb70e92..59097e4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB4.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
 
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
index 89d9c8a..60ce772 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB5.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
 
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
index 1f99594..7eb4a73 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/bindings/ejb/SlessEJB6.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ejb30.interceptors.bindings;
 
 
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
index ec4e090..4037f05 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.interceptors.session.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
index 39625d4..6ca24ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseInterceptor.java
@@ -22,8 +22,8 @@
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
 
 public class BaseInterceptor
 	implements java.io.Serializable {

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
index c16b72a..54bb437 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/BaseLifecycleInterceptor.java
@@ -18,11 +18,11 @@
 
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-import javax.ejb.EJB;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 public class BaseLifecycleInterceptor
 	implements java.io.Serializable {

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
index 43713e5..3c6c340 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyBaseEJB.java
@@ -19,11 +19,11 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
 public abstract class DummyBaseEJB

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
index 8b9bfd6..83c4943 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyEJB.java
@@ -16,11 +16,11 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
 @Interceptors({

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
index 42609f3..4a8d95b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/DummyLevel2EJB.java
@@ -16,11 +16,11 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
index 18d1e8a..402a420 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/LifecycleCallbackInterceptor.java
@@ -22,15 +22,15 @@
 
 import javax.interceptor.AroundInvoke;
 
-import javax.ejb.PrePassivate;
+import jakarta.ejb.PrePassivate;
 
-import javax.ejb.PostActivate;
+import jakarta.ejb.PostActivate;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import jakarta.annotation.Resource;
 
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
index f99daae..d03bf26 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
index f60f7c9..9acb73c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SfulEJB.java
@@ -18,7 +18,7 @@
 
 
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 import javax.interceptor.InvocationContext;
 
@@ -26,9 +26,9 @@
 
 import javax.interceptor.Interceptors;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
index 8aca9ba..a2ab35a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/Sless.java
@@ -18,7 +18,7 @@
 
 
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
index 1b56b3d..3304b90 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/inheritence/ejb/SlessEJB.java
@@ -18,7 +18,7 @@
 
 
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
index fdc1a93..ee21ea7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.interceptors.intro.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java
index 6d316a8..098982f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.intro;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
index e9a912b..9571a1e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/intro/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.intro;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.Interceptors;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
index b87e715..2b7cd66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
index d4b4e77..236d28a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateful.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.mdb;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
 
 // Hello1 interface is not annotated with @Local. If the

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java
index 5762ebc..4cf3920 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.mdb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 // Hello1 interface is not annotated with @Local. If the
 // bean only implements one interface it is assumed to be

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
index 748a6a0..6a9216d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/mdb/ejb/MessageBean.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.mdb;
 
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
 
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
index 551d6f1..3884711 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.interceptors.session.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
index d7e6e31..bdc53c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/BaseInterceptor.java
@@ -19,8 +19,8 @@
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
 import jakarta.annotation.PostConstruct;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
 
 public class BaseInterceptor {
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
index 8b2679e..8314cc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/DummyEJB.java
@@ -16,11 +16,11 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.Interceptors;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import jakarta.annotation.PostConstruct;
 
 @Interceptors({

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
index aecfa04..23731f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/ErrorRecoveryInterceptor.java
@@ -21,7 +21,7 @@
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 public class ErrorRecoveryInterceptor {

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
index 0a33851..e54dc33 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/LifecycleCallbackInterceptor.java
@@ -19,11 +19,11 @@
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-import javax.ejb.EJB;
+import jakarta.ejb.PrePassivate;
+import jakarta.ejb.PostActivate;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 public class LifecycleCallbackInterceptor {
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
index 5774604..d270375 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sful.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.HashMap;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
index 4949dc6..d46814f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SfulEJB.java
@@ -19,13 +19,13 @@
 import java.util.Map;
 import java.util.HashMap;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
index ea39b74..c8be6ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface Sless

appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
index 3bfb5dc..6394dd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/interceptors/session/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.interceptors.session;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.Interceptors;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
index bbe7d61..f75621c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejb.devtest.Sless;
 import com.sun.ejb.devtest.Sless30;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java
index e56fbed..761cfe3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java
index 34f4b0c..f11747d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless30 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 072f10c..2d38653 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class Sless30Bean

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
index ec4a300..ee39cd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/multi/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class SlessBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
index 68c8340..da47a87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejb.devtest.Sless;
 import com.sun.ejb.devtest.Sless30;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java
index e56fbed..761cfe3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java
index 34f4b0c..f11747d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30.java
@@ -16,7 +16,7 @@
 
 package com.sun.ejb.devtest;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless30 {

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
index 072f10c..2d38653 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/Sless30Bean.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class Sless30Bean

appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
index ec4a300..ee39cd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/intro/stateless/ejb/com/sun/ejb/devtest/SlessBean.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.PostConstruct;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 @Stateless
 public class SlessBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
index 17a7975..ed3c2b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.persistence.context.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java
index 70b296b..fc0ceb9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.context;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
index 502cf47..0478556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/context/ejb/SlessBean.java
@@ -18,15 +18,15 @@
 
 import java.util.Vector;
 import java.util.List;
-import javax.ejb.Stateless;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJBException;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceProperty;
 import javax.persistence.TransactionRequiredException;
 import javax.persistence.Query;
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateless
 public class SlessBean implements Sless {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
index 3710a66..4208da2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java
index e3ac600..574a66e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
index 43aac52..0339f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulBean.java
@@ -21,17 +21,17 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @EJB(name="ejb/SfulBean", 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
index fc89aaf..c4184a5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
index 0921954..8aeda75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulDelegateBean.java
@@ -16,15 +16,15 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
index b5ea0fa..6e824d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeer.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
index 5f017d0..4a6f788 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SfulPeerBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulPeerBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
index d188fa1..44e19fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
index 80407d3..7c8b947 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_1slsb_2sfsbs/ejb/SlessBean.java
@@ -16,15 +16,15 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_1slsb_2sfsbs;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateless
 public class SlessBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
index dfa8157..498fc5e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java
index 4eb7b1a..5bb0871 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
index 084f794..62867a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulBean.java
@@ -21,17 +21,17 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @EJB(name="ejb/SfulBean", 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
index 85de779..5fd2e87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
index e720e28..dd800fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulDelegateBean.java
@@ -16,15 +16,15 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
index cee2b22..3dcd1c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeer.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
index 0be8e5a..87b7bad 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_3sfsbs/ejb/SfulPeerBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_3sfsbs;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulPeerBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
index e8cf1b9..440ace1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java
index bb0bcf6..867f81d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/AdaptedLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 public interface AdaptedLocalHome
     extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java
index 75a3aab..bf38d6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
index 6a24b91..62c0964 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulBean.java
@@ -21,9 +21,9 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
-import javax.ejb.LocalHome;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalHome;
 
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
@@ -31,9 +31,9 @@
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 public class SfulBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
index 872e267..7151fce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
index 8e2df26..962eedf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_adapted/ejb/SfulDelegateBean.java
@@ -16,17 +16,17 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_adapted;
 
-import javax.ejb.Stateful;
-import javax.ejb.Init;
-import javax.ejb.LocalHome;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Init;
+import jakarta.ejb.LocalHome;
 
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 @LocalHome(AdaptedLocalHome.class)

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
index 5d61b2e..eae50e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.persistence.eem_injection.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java
index 933f2e8..3b603bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
index 0d32145..bdbe1ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulBean.java
@@ -21,17 +21,17 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @EJB(name="ejb/SfulBean", 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
index 1878ca3..4977c00 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_injection;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
index 4ef8bf4..6ec4b18 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eem_injection/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eem_injection;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java
index 4934f07..ce271f8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/client/Client.java
@@ -20,7 +20,7 @@
 
 import java.util.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.s1asdev.ejb30.eempassivation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
index 2182f60..7ae4482 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
index 5c53c67..01455df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulBean.java
@@ -19,15 +19,15 @@
 import java.util.Map;
 import java.util.HashMap;
 import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @EJB(name = "ejb/SfulBean", beanInterface = com.sun.s1asdev.ejb30.eempassivation.SfulDelegate.class)

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
index 4ecee29..fa1846c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb30.eempassivation;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
index b0a0d35..28f80a7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SfulDelegateBean.java
@@ -16,16 +16,16 @@
 
 package com.sun.s1asdev.ejb30.eempassivation;
 
-import javax.ejb.Stateful;
-import javax.ejb.PostActivate;
-import javax.ejb.PrePassivate;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.PostActivate;
+import jakarta.ejb.PrePassivate;
 
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java
index 53b7a36..f89da36 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb30.eempassivation;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface Sless {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java
index a50f94f..a3a73e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempassivation/ejb/src/com/sun/s1asdev/ejb30/eempassivation/SlessBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb30.eempassivation;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 
 import javax.naming.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
index fbe9a52..335a623 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.persistence.eempropagation.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java
index 1b715ab..d36fc1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
index fe6a346..c014560 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulBean.java
@@ -21,17 +21,17 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @EJB(name="ejb/SfulBean", 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
index 51c06c6..24c4bb3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eempropagation;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
index 3e3e233..1a0e0bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eempropagation/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.eempropagation;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
index be5f7d7..058b203 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
index 086c8f4..53924de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/eemsfsbpassivation/ejb/src/com/sun/s1asdev/ejb30/eemsfsbpassivation/SfulBean.java
@@ -19,15 +19,15 @@
 import java.util.Map;
 import java.util.HashMap;
 import javax.naming.InitialContext;
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 public class SfulBean implements Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
index a03db72..a3952b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.persistence.extendedem.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
index 241e79a..17ccc09 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Person.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 
 @Entity

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java
index c0d4803..3d185b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
index ec9e436..1f0d7d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/extendedem/ejb/SfulBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.extendedem;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulBean

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
index 87a21a2..3e7d70c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import java.sql.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.transaction.UserTransaction;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java
index 4c970be..06e0dc5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
index 5531853..c873b9f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulBean.java
@@ -21,17 +21,17 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @Stateful
 @EJB(name="ejb/SfulBean", 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
index 03e7f74..de756e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
index f06f15c..714510f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb30/persistence/tx_propagation/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
index 2e43cbf..1a7fd82 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
index 47dad57..693a122 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
index b06221a..a8e8cb0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/localandremote/ejb/SuperAsync.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import java.util.concurrent.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SuperAsync { 
     public Future<String> hello(String name);

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
index 2343017..97ecdc3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;
@@ -95,7 +95,7 @@
 	    }
 	    
 	    try {
-		Future<String> f = statefulBeanLegacyRemote.throwException("javax.ejb.CreateException");
+		Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.CreateException");
 		String result = f.get();
 		throw new EJBException("Didn't get CreateException");
 	    } catch(ExecutionException ee) {
@@ -108,7 +108,7 @@
 	    }
 
 	    try {
-		Future<String> f = statefulBeanLegacyRemote.throwException("javax.ejb.EJBException");
+		Future<String> f = statefulBeanLegacyRemote.throwException("jakarta.ejb.EJBException");
 		String result = f.get();
 		throw new EJBException("Didn't get EJBException");
 	    } catch(ExecutionException ee) {

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
index b4cbd99..6354612 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java
index 8146a01..75ccc74 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
index c051996..3c76283 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/RemoteAsync3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
index c66c696..b3d86207 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import java.util.concurrent.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
index 40a53c8..9089131 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/remote/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import java.util.concurrent.*;
@@ -47,9 +47,9 @@
 
     @Asynchronous
 	public Future<String> throwException(String exception) throws CreateException {
-	if( exception.equals("javax.ejb.CreateException") ) {
+	if( exception.equals("jakarta.ejb.CreateException") ) {
 	    throw new CreateException();
-	} else if ( exception.equals("javax.ejb.EJBException") ) {
+	} else if ( exception.equals("jakarta.ejb.EJBException") ) {
 	    throw new EJBException();
 	}
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
index f83bfd1..0d80aeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/client/Client.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.naming.*;
 import java.util.concurrent.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java
index ef69e7d..4b5fa77 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.concurrent.*;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
index 8c2f42d..44c5141 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/asynchronous/threadpoolconfig/ejb/HelloBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
index 5d444b9..3d61b71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/AbstractBaseEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1as.devtests.ejb.generics;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java
index e7fe06a..260f246 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1as.devtests.ejb.generics;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Stateless
 public class TestBean extends AbstractBaseEJB<Object> {

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
index 0dc558b..59056b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TestServlet.java
@@ -21,7 +21,7 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 import jakarta.annotation.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @javax.servlet.annotation.WebServlet(urlPatterns = "/TestServlet")
 public class TestServlet extends HttpServlet {

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java
index ee4b07c..9888543 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/generics/war/TypeVariableBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1as.devtests.ejb.generics;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Stateless
 public class TypeVariableBean<T> {

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
index 7d7cf27..d1df3f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/BarManagedBean.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
index 42950b4..807efa1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/FooManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
index 3e19563..b19027c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
index 1f2378a..c1bd9b6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorA.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
index fd2c630..b72ac76 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/InterceptorB.java
@@ -22,7 +22,7 @@
 import javax.interceptor.AroundInvoke;
 import java.util.Map;
 
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 public class InterceptorB extends InterceptorSuper {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
index 77a2d3d..a4a80da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/ManagedSuper.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
index 63d118e..394ffce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/SingletonBean.java
@@ -23,13 +23,13 @@
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalBean;
 
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 @Singleton
 @LocalBean

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
index 6cb2e78..e5a3a6a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatefulBean.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.Stateful;
-import javax.ejb.*;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.*;
 import javax.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
index 4f94e2f..c52310f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/javamodule/war/StatelessBean.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
-import javax.ejb.*;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.*;
 import javax.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
index 1942e13..9d34425 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
index 0e69824..d382256 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/SingletonBean.java
@@ -23,10 +23,10 @@
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJBException;
-import javax.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJB;
 
 @Singleton
 public class SingletonBean {

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
index 633bd91..bd5e5a2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/jaxrs/war/StatelessBean.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
-import javax.ejb.*;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.*;
 import javax.interceptor.Interceptors;
 
 import jakarta.annotation.PostConstruct;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
index 8a2bd43..690fd72 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
index 64a1924..9b0680a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorA.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.transaction.UserTransaction;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
index 10cca6f..7f9ce06 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/managedbean/war/InterceptorB.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.transaction.UserTransaction;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
index 4b906ba..9312076 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/ContextListener.java
@@ -24,7 +24,7 @@
 
 import java.lang.reflect.Method;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 @WebListener
 public class ContextListener implements ServletContextListener {

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
index 70f89aa..4043c97 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/HelloServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
index 6ef020c..0d7328b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleSingleton.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
index 43b7400..9c519b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateful.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
index b97cb41..066d15b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/ejblite/sinitcallejb/war/SimpleStateless.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
index 6cea616..fc08df8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/basic/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.PostConstruct;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
index 5c5a8ce..0136dfb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/client/Client.java
@@ -22,8 +22,8 @@
 import java.util.Date;
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
index 3aaa9f6..df9341d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/datasourcedef/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.annotation.sql.DataSourceDefinition;
 
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java
index c36d00c..558489e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java
index f26b5d8..255a4c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/OtherEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  */

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
index b30b33f..2f1ebf9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java
index b95d309..b2d1288 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbandwar/servlet/TestServlet.java
@@ -17,7 +17,7 @@
 package test;
 
 import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import javax.servlet.annotation.WebServlet;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java
index ef65be1..3e76411 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import java.net.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
index b0f9a5a..5110a44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java
index b95d309..b2d1288 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/ejbinwar/servlet/TestServlet.java
@@ -17,7 +17,7 @@
 package test;
 
 import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import javax.servlet.annotation.WebServlet;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
index 8c67365..cdb0d29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/client/Client.java
@@ -18,8 +18,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
index 5400a2d..ed400ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
index f23a39c..cfd2dd5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.inject.Inject;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
index 9862f24..ae2767f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/embedasync/ejb/StatefulBean2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
index 2b78b21..ee5e095 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/client/Client.java
@@ -19,8 +19,8 @@
 import org.glassfish.tests.ejb.sample.Simple;
 import embedded.util.ZipUtil;
 
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 import java.io.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
index 8093ff6..5ecfbd9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/jaxrs/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.ws.rs.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java
index bbb1541..29a7738 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/manifestonly/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.PostConstruct;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java
index 58d1848..b12ef99 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/client/Client.java
@@ -18,8 +18,8 @@
 
 import org.glassfish.tests.ejb.mdb.SimpleEjb;
 
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
index c15893d..cb0cdaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.mdb;
 
-import javax.ejb.Singleton;
+import jakarta.ejb.Singleton;
 import jakarta.jms.*;
 import jakarta.annotation.Resource;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
index 86bc71d..e1dd3fb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/mdb/ejb/SimpleMDB.java
@@ -21,7 +21,7 @@
 
 package org.glassfish.tests.ejb.mdb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java
index 361840e..64314fd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/client/Client.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithappname/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.PostConstruct;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
index 0527841..30538e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
index 6b34d06..ad1af2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java
index 605516d..1d9a878 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SimpleInterface.java
@@ -19,7 +19,7 @@
 /**
  * @author mvatkina
  */
-@javax.ejb.Local
+@jakarta.ejb.Local
 public interface SimpleInterface {
 
     public String saySomething() ;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithinheritance/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.PostConstruct;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
index 9c2d23d..735fef6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
index 6b34d06..ad1af2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java
index 624b109..d1bb136 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SimpleInterface.java
@@ -19,7 +19,7 @@
 /**
  * @author mvatkina
  */
-@javax.ejb.Local
+@jakarta.ejb.Local
 public interface SimpleInterface {
 
     public String saySomething() ;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithlibs/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.PostConstruct;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java
index e1d7ac2..2daf7f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/modulewithmanifest/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.PostConstruct;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java
index b2bfaef..a099532 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java
index 77ce77b..9fa56b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/Simple.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.profile;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 /**
  * @author Marina Vatkina

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java
index c952d70..d9e43b7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/profile/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.profile;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Marina Vatkina

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java
index 75284d2..bf8efa0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java
index 1f7c938..e3b2988 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/remote/ejb/SimpleEjb.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.remote;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
 
 /**
  * @author Marina Vatkina

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java
index 42e6209..e1a0a0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
index ad0b022..a56f2f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
index 5956110..ca2784f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/skipjar/ejb/SingletonBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.PostConstruct;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java
index fd1be74..ef82c87 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/client/Client.java
@@ -21,8 +21,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
index 7c245e2..860d7b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/testclose/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java
index 5b7a076..e86a3a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java
index 197c8d6..21c8f43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/timertest/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.timertest;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.InitialContext;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java
index 3273a86..634986e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
index 8ef2898..2960843 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twocontainers/ejb/SimpleEjb.java
@@ -19,7 +19,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityManager;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
index edbf696..4e52ed3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
index 1eb2980..efa0b55 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SimpleEjb.java
@@ -19,8 +19,8 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.DenyAll;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
index 803a0e1..280923c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomodules/ejb/SingletonBean.java
@@ -16,9 +16,9 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
-import javax.ejb.SessionContext; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
+import jakarta.ejb.SessionContext; 
 import jakarta.annotation.Resource;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.security.PermitAll;

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
index b6bacb8..58ab5f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
index 0a64c1a..c456c66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SimpleEjb.java
@@ -19,8 +19,8 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.Stateless;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.EJB;
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.DenyAll;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
index 803a0e1..280923c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/embedded/twomoduleswithlibs/ejb/SingletonBean.java
@@ -16,9 +16,9 @@
 
 package org.glassfish.tests.ejb.sample;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup; 
-import javax.ejb.SessionContext; 
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup; 
+import jakarta.ejb.SessionContext; 
 import jakarta.annotation.Resource;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.security.PermitAll;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
index 260442d..aa3d791 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.naming.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java
index 88dd732..d249627 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Hello {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
index 65fcd72..610f7a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/disable_nonportable_jndi/ejb/HelloBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateless(mappedName="HH")

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
index 0d1d550..4d8ca0f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/BarManagedBean.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
index def96fa..51a1269 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/FooManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
index c9a3335..9f66d01 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloSingleton.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
index cd99e41..3504771 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
index 11f95d7..94276bc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/InterceptorA.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import org.omg.CORBA.ORB;
 import jakarta.annotation.Resource;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
index 719ab5d..de1e35a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/ManagedSuper.java
@@ -17,7 +17,7 @@
 package com.acme;
 
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
index 7b8a433..53ecd16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
index e67de47..6449f7a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
index 7f36037..43e649a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/ejb/Singleton4.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
index 359c5fc..a3e6b45 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Foo2ManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import org.omg.CORBA.ORB;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java
index cfea5cc..309d17f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/Hello.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 public interface Hello {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
index c382e64..f9f954e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
index a5eebe6..ab6c19f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloS2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
index 6cc0849..54a61e2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/ear/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
index 513f584..a761d29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
index 25bfecd..d1e89ef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Bar.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
index d122859..c4a941e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/DependentWithInjectedDataSource.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
index 2c705f0..76f0773 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SentenceTranslator.java
@@ -16,7 +16,7 @@
 
 package org.jboss.weld.examples.translator;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class SentenceTranslator implements Translator 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
index 44445ec..f4e5b14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
index 70c5786..827fd2e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBean2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
index 8bc1e05..eb03ce4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonBeanA.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java
index 3f45b65..d0b8e5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SingletonRemote {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
index 8d1bd47..e471c70 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/SingletonStartupWithInjectedDependent.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java
index d69b61f..424a8e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatefulLocal.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface StatefulLocal {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
index 697e335..34e580d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
index 722f02a..008b8fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessBean2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.inject.Inject;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java
index 4f2fd84..ac557e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface StatelessLocal {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java
index 4bc1af8..d999cc7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/StatelessLocal2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface StatelessLocal2 {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
index 11fdaf5..b047439 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TextTranslator.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.inject.Inject;
 
 public class TextTranslator implements Serializable

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
index 5a82fdd..057830c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/Translator.java
@@ -16,7 +16,7 @@
 
 package org.jboss.weld.examples.translator;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local 
 public interface Translator 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
index 4045b42..89488a8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/jcdifull/ejb/TranslatorControllerBean.java
@@ -16,8 +16,8 @@
 
 package org.jboss.weld.examples.translator;
 
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.inject.Named;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
index 3f8fd4c..0e5499c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java
index f1cbfcb..0c973e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/Hello.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.concurrent.Future;
-import javax.ejb.Asynchronous;
+import jakarta.ejb.Asynchronous;
 
 @Remote
 public interface Hello {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
index c5f504d..4cf02f2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.Interceptors;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java
index c3e9d39..d773e75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloHome.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java
index 22ec5cf..c98e0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface HelloRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
index a32ddd6..e4c4a59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/NonSerializableInterceptor.java
@@ -19,7 +19,7 @@
 import jakarta.annotation.*;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 public class NonSerializableInterceptor {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
index 2c8fd91..42e9f94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonMultiIntf.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
index 6d0755c..0d53adb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/SingletonNoIntf.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
index c66acf2..7714e0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulExpiration.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
index 29e427c..85a3874 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatefulNoIntf.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
index 4517632..c082754 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/passact/ejb/StatelessNoIntf.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
index deb410a..f61bbd2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;
@@ -106,12 +106,12 @@
 	    }
 	 
 	    Future<String> futureException = 
-		hello.asyncThrowException("javax.ejb.ConcurrentAccessTimeoutException");
+		hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
 	    try {
 		String result = futureException.get();
 		throw new EJBException("Should have gotten exception");
 	    } catch(ExecutionException e) {
-		if( e.getCause() instanceof javax.ejb.ConcurrentAccessTimeoutException) {
+		if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
 		    System.out.println("Got correct async exception. Cause is " +
 				       e.getCause().getMessage());
 		} else {
@@ -135,21 +135,21 @@
 	    }
 
 	    try {
-		hello.throwException("javax.ejb.ConcurrentAccessException");
+		hello.throwException("jakarta.ejb.ConcurrentAccessException");
 		throw new EJBException("expected an exception");
 	    } catch(ConcurrentAccessException cae) {
 		System.out.println("Got expected " + cae);
 	    }
 
 	    try {
-		hello.throwException("javax.ejb.ConcurrentAccessTimeoutException");
+		hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
 		throw new EJBException("expected an exception");
 	    } catch(ConcurrentAccessTimeoutException cat) {
 		System.out.println("Got expected " + cat);
 	    }
 
 	    try {
-		hello.throwException("javax.ejb.IllegalLoopbackException");
+		hello.throwException("jakarta.ejb.IllegalLoopbackException");
 		throw new EJBException("expected an exception");
 	    } catch(IllegalLoopbackException ile) {
 		System.out.println("Got expected " + ile);

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java
index ea6175a9..f0095d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Blah.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 public class Blah {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
index 4cffaf5..80eaa31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.concurrent.Future;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
index 5f19b42..eec3523 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;
 
@@ -97,13 +97,13 @@
     }
 
     public void throwException(String exceptionType) {
-	if( exceptionType.equals("javax.ejb.EJBException") ) {
+	if( exceptionType.equals("jakarta.ejb.EJBException") ) {
 	    throw new EJBException(exceptionType);
-	} else if( exceptionType.equals("javax.ejb.ConcurrentAccessException") ) {
+	} else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessException") ) {
 	    throw new ConcurrentAccessException(exceptionType);
-	} else if( exceptionType.equals("javax.ejb.ConcurrentAccessTimeoutException") ) {
+	} else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessTimeoutException") ) {
 	    throw new ConcurrentAccessTimeoutException(exceptionType);
-	} else if( exceptionType.equals("javax.ejb.IllegalLoopbackException") ) {
+	} else if( exceptionType.equals("jakarta.ejb.IllegalLoopbackException") ) {
 	    throw new IllegalLoopbackException(exceptionType);
 	}
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java
index c3e9d39..d773e75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloHome.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java
index 22ec5cf..c98e0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface HelloRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
index 20effb9..37b1265 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote1/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
index 50c9f8d..9cad009 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
index 4cffaf5..80eaa31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.concurrent.Future;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java
index c3e9d39..d773e75 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloHome.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java
index 22ec5cf..c98e0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface HelloRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java
index c44181d..a71309d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/RemoteAsync.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
index 320a063..06ac43e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;
@@ -137,12 +137,12 @@
 	    }
 	 
 	    Future<String> futureException = 
-		hello.asyncThrowException("javax.ejb.ConcurrentAccessTimeoutException");
+		hello.asyncThrowException("jakarta.ejb.ConcurrentAccessTimeoutException");
 	    try {
 		String result = futureException.get();
 		throw new EJBException("Should have gotten exception");
 	    } catch(ExecutionException e) {
-		if( e.getCause() instanceof javax.ejb.ConcurrentAccessTimeoutException) {
+		if( e.getCause() instanceof jakarta.ejb.ConcurrentAccessTimeoutException) {
 		    System.out.println("Got correct async exception. Cause is " +
 				       e.getCause().getMessage());
 		} else {
@@ -171,21 +171,21 @@
 
 
 	    try {
-		hello.throwException("javax.ejb.ConcurrentAccessException");
+		hello.throwException("jakarta.ejb.ConcurrentAccessException");
 		throw new EJBException("expected an exception");
 	    } catch(ConcurrentAccessException cae) {
 		System.out.println("Got expected " + cae);
 	    }
 
 	    try {
-		hello.throwException("javax.ejb.ConcurrentAccessTimeoutException");
+		hello.throwException("jakarta.ejb.ConcurrentAccessTimeoutException");
 		throw new EJBException("expected an exception");
 	    } catch(ConcurrentAccessTimeoutException cat) {
 		System.out.println("Got expected " + cat);
 	    }
 
 	    try {
-		hello.throwException("javax.ejb.IllegalLoopbackException");
+		hello.throwException("jakarta.ejb.IllegalLoopbackException");
 		throw new EJBException("expected an exception");
 	    } catch(IllegalLoopbackException ile) {
 		System.out.println("Got expected " + ile);

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java
index 80db3eb..421333a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/SingletonRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface SingletonRemote {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
index 9e0008b..0474062 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/remote2/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import java.util.concurrent.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
index c7d5e57..0028952 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
index 8597331..94b0383 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/descriptor/ejb-jar.xml
@@ -71,7 +71,7 @@
           <timeout-method>
             <method-name>mytimeout</method-name>
 	    <method-params>
-	      <method-param>javax.ejb.Timer</method-param>
+	      <method-param>jakarta.ejb.Timer</method-param>
 	    </method-params>
 	  </timeout-method>
           <persistent>true</persistent>

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
index 6072b30..9a54e8c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/MultiBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.InitialContext;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java
index 7c87a7f..8fe5193 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/RemoteSingleton.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface RemoteSingleton {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
index 13b1648..de2d2dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
index c82ffe9..6e7b9e7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatefulBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 public class StatefulBean {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
index 47fba0c..d134582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/schema/ejb/StatelessBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Stateless
 public class StatelessBean {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
index 112a9d0..6942a4c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
index b3b66e1..97a24c8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/RemoteAsync.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
index d75c96f..ef4b71f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import java.util.concurrent.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
index de32063..35f62d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanNotSerialized.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateful(mappedName="StatefulBeanNotSerialized")

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
index c4e038e..84f9e38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSerialized.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateful(mappedName="StatefulBeanSerialized")

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
index b8f752f..59c4f9f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulBeanSuper.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import java.util.concurrent.*;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java
index 755f873..418bd6e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncLocal.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Local

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java
index dbc8bea..2a205b9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
index 325bb02..e248283 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/sfsbscnc/ejb/StatefulCncSuperIntf.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 public interface StatefulCncSuperIntf {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java
index 4fe64fc..9a378d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface HelloRemote {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
index 0b0d50e..4ab1659 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloServlet.java
@@ -16,9 +16,9 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.ConcurrentAccessException;
-import javax.ejb.ConcurrentAccessTimeoutException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.ConcurrentAccessException;
+import jakarta.ejb.ConcurrentAccessTimeoutException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
index 18a7fe7..068370c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.TimeUnit;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
index d013d7c..3faf72b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloSingleton2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.transaction.UserTransaction;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
index fb1dc64..d908d14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.TimeUnit;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
index c8c8434..bed2194 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateful2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
index cffd62a..8718981 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java
index 1a5006b..a99a527 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @TransactionAttribute(TransactionAttributeType.SUPPORTS)
 public class Super {

appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
index c95e8a7..04f10bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/full/webandejb/war/Super1.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.TimeUnit;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
index 1629b5b..99320c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
index ff32f2f..58d1488 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/security/simple/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import jakarta.annotation.security.*;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
index 8856566..31ed837 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
index 0723a6a..d164b13 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicBoolean;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java
index 9afc0cf..076b095 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/cache/ejb/CacheRemote.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.concurrent.Future;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
index a801c46..c68e043 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java
index c341dcb..8f45828 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class Foo {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java
index d7a154d..c763dcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/Hello.java
@@ -20,7 +20,7 @@
 
     String hello();
 
-    @javax.ejb.Asynchronous
+    @jakarta.ejb.Asynchronous
     void async();
 
     void test_Err_or(String s1, String s2);

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
index 393b5c2..94aab9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/hello/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.annotation.*;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
index e425b88..e460cbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml
index 407952f..fa133f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/singleton.iml
@@ -31,7 +31,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/javax.ejb.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/jakarta.ejb.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
index 1d66b99..cde7170 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
@@ -24,9 +24,9 @@
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
 
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
-import javax.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
+import jakarta.ejb.DependsOn;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index 125364f..f10b62f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -24,10 +24,10 @@
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
 
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index 368dd83..b96868f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -24,8 +24,8 @@
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
 
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index 4b0f349..a9738b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -24,10 +24,10 @@
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.multimodule.servlet.LocalInitTracker;
 
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
index e816fd0..4404cdd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
@@ -21,10 +21,10 @@
 
 package org.glassfish.devtest.ejb31.singleton.multimodule.servlet;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.Local;
-import javax.ejb.Remote;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
 import jakarta.annotation.PostConstruct;
 import java.util.Map;
 import java.util.HashMap;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index 27d0a56..dd49b4d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.devtest.ejb31.singleton.multimodule.servlet;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 import java.util.Map;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
index 2ff3488..b486aaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/multi-module/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.devtest.ejb31.singleton.multimodule.servlet;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.Map;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
index a2291fc..aeb38c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/client/Client.java
@@ -21,8 +21,8 @@
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml
index 407952f..fa133f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/singleton.iml
@@ -31,7 +31,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/javax.ejb.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../../../../../../glassfishv3/glassfish/modules/jakarta.ejb.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
index ae8d6e8..34ab343 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/BeanA_Mod1.java
@@ -24,9 +24,9 @@
 import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
 
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
-import javax.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
+import jakarta.ejb.DependsOn;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
index 0724ac1..1fdc8e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod1/RootBean_Mod1.java
@@ -24,10 +24,10 @@
 import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
 
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
index 2e5750b..2b60295 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/BeanA_Mod2.java
@@ -24,8 +24,8 @@
 import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
 
-import javax.ejb.Singleton;
-import javax.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
index aa8cb90..900d211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/mod2/RootBean_Mod2.java
@@ -24,10 +24,10 @@
 import org.glassfish.devtest.ejb31.singleton.servlet.RemoteInitTracker;
 import org.glassfish.devtest.ejb31.singleton.servlet.LocalInitTracker;
 
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.EJB;
 import jakarta.annotation.PostConstruct;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
index 15fde73..c6b101d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/InitOrderTrackerBean.java
@@ -21,10 +21,10 @@
 
 package org.glassfish.devtest.ejb31.singleton.servlet;
 
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import javax.ejb.Local;
-import javax.ejb.Remote;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
 import jakarta.annotation.PostConstruct;
 import java.util.List;
 import java.util.ArrayList;

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
index 855d29f..a2ccdd8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/LocalInitTracker.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.devtest.ejb31.singleton.servlet;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 import java.util.List;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
index 80ab1c7..10e94e9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/singleton/threemodules/ejb/src/main/java/org/glassfish/devtest/ejb31/singleton/servlet/RemoteInitTracker.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.devtest.ejb31.singleton.servlet;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.List;
 
 @Remote

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
index e837fc5..8b7e34f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/client/Client.java
@@ -18,8 +18,8 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import com.sun.s1asdev.ejb.ejb31.aroundtimeout.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml
index 1a4d3c5..8bae126 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/descriptor/ejb-jar.xml
@@ -126,7 +126,7 @@
       <method>
          <method-name>eg</method-name>
          <method-params>
-           <method-param>javax.ejb.Timer</method-param>
+           <method-param>jakarta.ejb.Timer</method-param>
          </method-params>
       </method>
     </interceptor-binding>

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
index 0162e03..c1c2a53 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Common.java
@@ -24,8 +24,8 @@
 import java.util.Collections;
 
 import javax.interceptor.InvocationContext;
-import javax.ejb.EJBException;
-import javax.ejb.Timer;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Timer;
 
 public class Common {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
index 9a26ab7..1054f3a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/InterceptorA.java
@@ -20,7 +20,7 @@
 import javax.interceptor.InvocationContext;
 import jakarta.annotation.PostConstruct;
 import javax.naming.InitialContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 public class InterceptorA {

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
index 414c4b8..cfc4e10 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless3.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless3

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
index 95fcbd2..5b56aa6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless4.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless4

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
index 98ab8fa..4fcb31e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless5.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless5

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
index 9329e52..77f94db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/Sless6.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 	
 @Remote
 public interface Sless6

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
index 6785395..101e4f5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB3.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
 
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
index 7a29c3b..32db506 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB4.java
@@ -17,11 +17,11 @@
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
 import java.util.Collection;
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
index cf53634..4413953 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB5.java
@@ -17,10 +17,10 @@
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
 
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
index 04168bd..d6599b2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB6.java
@@ -17,11 +17,11 @@
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
 
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
index 728d7db..09716b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/aroundtimeout/ejb/SlessEJB7.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.ejb31.aroundtimeout;
 
 
-import javax.ejb.Stateless;
-import javax.ejb.Schedule;
-import javax.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.EJBException;
 import javax.interceptor.Interceptors;
 import javax.interceptor.ExcludeDefaultInterceptors;
 import javax.interceptor.ExcludeClassInterceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
index 68f7bf4..b1d85fe 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.timer31.keepstate.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import com.sun.s1asdev.ejb31.timer.keepstate.KeepStateIF;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
index 4d859fa..0a0a08a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.keepstate;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.List;
 import java.util.ArrayList;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java
index c0e28c2..a7f530f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/keepstate/ejb/KeepStateIF.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.keepstate;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface KeepStateIF {
     public static final String OLD_INFO = "xxx";
     public static final String NEW_INFO = "yyy";

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
index 268fbb9..7c6869e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml
index b4b9136..07ae654 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/descriptor/ejb-jar.xml
@@ -32,7 +32,7 @@
         <timeout-method>
           <method-name>onDDTimeout</method-name>
           <method-params>
-              <method-param>javax.ejb.Timer</method-param>
+              <method-param>jakarta.ejb.Timer</method-param>
           </method-params>
         </timeout-method>
         <info>dd_timer</info>

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
index c43ece1..dfdfef7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/MessageBean.java
@@ -16,22 +16,22 @@
 
 package com.acme;
 
-import javax.ejb.MessageDriven;
-import javax.ejb.EJB;
-import javax.ejb.Schedule;
-import javax.ejb.Timer;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Timer;
 import javax.interceptor.AroundTimeout;
 import javax.interceptor.InvocationContext;
 import javax.interceptor.Interceptors;
 
 import jakarta.annotation.Resource;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenContext;
 import jakarta.jms.MessageListener;
 import jakarta.jms.Message;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.security.*;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 
 @Interceptors(InterceptorA.class)
 @MessageDriven(mappedName="jms/ejb_ejb31_timer31_mdb_InQueue", description="mymessagedriven bean description")

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
index 5c849e5..6494096 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/mdb/ejb/SingletonBean.java
@@ -19,7 +19,7 @@
 import java.util.Set;
 import java.util.HashSet;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import org.omg.CORBA.ORB;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
index c0b92d7..93c157c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/client/Client.java
@@ -16,7 +16,7 @@
 
 package client.timer31.methodintf;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import ejb31.timer.methodintf.Stles;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java
index a2741b7..8885b4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/Stles.java
@@ -16,7 +16,7 @@
 
 package ejb31.timer.methodintf;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Stles {
 
     public boolean verifyTimers() throws Exception;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java
index b9dd6f8..45b6fea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/methodintf/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
 
 package ejb31.timer.methodintf;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
index 8842704..0a357f1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.timer31.nonpersistenttimer.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import com.sun.s1asdev.ejb31.timer.nonpersistenttimer.StatefulWrapper;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
index 114168e..562be71 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/descriptor/ejb-jar.xml
@@ -221,7 +221,7 @@
         <ejb-name>msgbean_CMT</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>
@@ -239,7 +239,7 @@
         <ejb-name>FooEJB_CMT</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java
index 14d87c8..b63f1d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Foo extends EJBLocalObject, TimerStuff {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
index d0189b6..731db69 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 
 public class FooEJB extends TimerStuffImpl implements SessionBean, TimedObject {

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java
index eed0222..4cc0ad9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/FooHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface FooHome extends EJBLocalHome {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
index 7145510..a41cdce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/MessageDrivenEJB.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class MessageDrivenEJB extends TimerStuffImpl 
     implements MessageDrivenBean, TimedObject, MessageListener {

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java
index b6a61d4..58d80d8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapper.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
-//@javax.ejb.Remote
+//@jakarta.ejb.Remote
 public interface StatefulWrapper {
 
     public boolean doMessageDrivenTest(String jndiName, boolean jms);
 
     public boolean doFooTest(String jndiName, boolean jms);
 
-    public void removeFoo() throws java.rmi.RemoteException, javax.ejb.RemoveException;
+    public void removeFoo() throws java.rmi.RemoteException, jakarta.ejb.RemoveException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
index 62fdeee..37ef97c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/StatefulWrapperImpl.java
@@ -17,11 +17,11 @@
 package com.sun.s1asdev.ejb31.timer.nonpersistenttimer;
 
 import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 
-//@javax.ejb.Stateful
+//@jakarta.ejb.Stateful
 public class StatefulWrapperImpl implements StatefulWrapper {
 
     private SessionContext context;
@@ -298,7 +298,7 @@
         timerStuff.assertNoTimers();
     }
 
-    public void removeFoo() throws java.rmi.RemoteException, javax.ejb.RemoveException {
+    public void removeFoo() throws java.rmi.RemoteException, jakarta.ejb.RemoveException {
         if (foo != null) {
             ((Foo) foo).remove();
         }

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
index 9537649..b0770e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuff.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface TimerStuff {
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
index 25345e3..1267451 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/nonpersistenttimer/ejb/TimerStuffImpl.java
@@ -23,7 +23,7 @@
 import java.util.Date;
 import java.util.Collection;
 import java.util.Iterator;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.QueueConnectionFactory;
 import jakarta.jms.QueueConnection;
 import jakarta.jms.Queue;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
index 8cc0c2f..7ddeae1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.timer31.reschedule_after_failures.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1asdev.ejb31.timer.reschedule_after_failures.Stles;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java
index 985160d..04f3d72 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/Stles.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.reschedule_after_failures;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Stles {
 
     public void createTimers() throws Exception;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
index 1d739be..a9c068c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/reschedule_after_failures/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.reschedule_after_failures;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.InvocationContext;
 import jakarta.annotation.Resource;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
index dd653f9..eb62bc4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.timer31.schedule_ann.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1asdev.ejb31.timer.schedule_ann.Stles;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java
index b17410f..e4539fa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/Stles.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.schedule_ann;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Stles {
 
     public void verifyTimers() throws Exception;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
index d173416..ecbf26a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_ann/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.schedule_ann;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 import java.util.Map;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
index 9e24248..623387d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.timer31.schedule_exp.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import com.sun.s1asdev.ejb31.timer.schedule_exp.Stles;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java
index 9908063..b83baba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/Stles.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.schedule_exp;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Stles {
 
     public void createTimers() throws Exception;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
index 6856585..447f521 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_exp/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.schedule_exp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.AroundTimeout;
 import javax.interceptor.InvocationContext;
 import jakarta.annotation.Resource;

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
index c7f2100..99ae483 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/client/Client.java
@@ -22,7 +22,7 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
index 2166400..48e8ca4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/descriptor/ejb-jar.xml
@@ -36,7 +36,7 @@
                 <timeout-method>
                     <method-name>ejbTimeout</method-name>
                     <method-params>
-                        <method-param>javax.ejb.Timer</method-param>
+                        <method-param>jakarta.ejb.Timer</method-param>
                     </method-params>
                 </timeout-method>
                 <info>Timer00</info>

appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
index 69c07b5..953da94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb31/timer31/schedule_on_ejb_timeout/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb31.timer.schedule_on_ejb_timeout;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.HashSet;
 import java.util.Set;

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
index 8ef5995..70a66a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb32.ejblite.async;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.io.*;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
index 751f640..4ce2f5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
index 0e2e7d0..3a92359 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
index 9862f24..ae2767f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/async/war/StatefulBean2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java
index ef29f61..39b58b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb32.ejblite.timer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Local
 public interface Foo extends TimerStuff {

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
index 325f974..5f12bff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooBMT.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb32.ejblite.timer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
index 756607d..cf9437e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/FooCMT.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb32.ejblite.timer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
index 7ab8608..a521a47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/HelloServlet.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb32.ejblite.timer;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java
index 3514be9..d7d55da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapper.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb32.ejblite.timer;
 
-@javax.ejb.Local
+@jakarta.ejb.Local
 public interface StatefulWrapper {
 
     public boolean doFooTest(boolean bmt);
 
-    public void removeFoo() throws java.rmi.RemoteException, javax.ejb.RemoveException;
+    public void removeFoo() throws java.rmi.RemoteException, jakarta.ejb.RemoveException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
index 7de55d3..d83116a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/StatefulWrapperImpl.java
@@ -22,7 +22,7 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 @Stateful
@@ -161,7 +161,7 @@
         timerStuff.assertNoTimers();
     }
 
-    public void removeFoo() throws javax.ejb.RemoveException {
+    public void removeFoo() throws jakarta.ejb.RemoveException {
         if (foo != null) {
             foo.remove();
         }

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java
index 63679b1..091a7c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuff.java
@@ -18,7 +18,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface TimerStuff {
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
index 1e81be9..9d75068 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/ejblite/nonpersistenttimer/war/TimerStuffImpl.java
@@ -23,7 +23,7 @@
 import java.util.Date;
 import java.util.Collection;
 import java.util.Iterator;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class TimerStuffImpl implements TimerStuff {
     

appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java
index d038d33..39a739d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/client/Client.java
@@ -20,8 +20,8 @@
 
 import java.util.Map;
 import java.util.HashMap;
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
index 134e71e..221f72e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/embedded/autoclose/ejb/SimpleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.autoclose;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Marina Vatkina

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
index b04d7fa..a82a0aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
index 26be205..edfd099 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
index 1dfd1e5..980fb66 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
index fcaa602..9b951ab 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
index 85abd87..168c62d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
index 62b575c..64fe03c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
index aec7e7c..92e4927 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean2.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
index 2c9ad1c..fcc7358 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/annotation/ejb/SomeManagedBean3.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
index 9fd05a1..52b1737 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
index 9fb32a8..8253139 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
index fb381be..dbd5530 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
index e6b1c0f..16968c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
index 6e6c0cc..da30d59 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
index 8b873f0..58fe2a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/aroundconstruct/descriptor/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import org.omg.CORBA.ORB;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
index cbcf350..7d12d60 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 import java.lang.reflect.*;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
index ab70c23..da687a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
index e83e682..af151e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
index cb0edf4..e33fdb4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
index c13d9aa..d418ee0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
index 0a1f22e..745658a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
index 9380117..a314c5a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
index e7ac442..fff6454 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
index 2d499bb..e726baf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
index efe9692..282c1d7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 import java.lang.reflect.*;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
index 550caa6..7199209 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
index a77424a..e070b7b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
index 6eb9327..9a2ff30 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
index 94148fb..5b392da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
index 1263644..457c3d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/constructor-level/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
index 057c9c6..752249c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 import java.lang.reflect.*;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
index 6f8d43d..7bfa7d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
index af6e641..fc7d740 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
index cb66ca0..18b48ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
index c2c9d6b..a479865 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
index 9752b21..9fb18dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
index c4565dc..2cc4208 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
index 1df1e1b..e13e0e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/annotation/ejb/SomeManagedBeanBase.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
index f47eb43..9a6d8d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 import java.lang.reflect.*;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
index 1ea47c0..0af939a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
index ab34822..27bb0b0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
index 95391d2..c18e6ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
index 94148fb..5b392da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
index 2ff2ac0..0373cde 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/get_method_lc/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
index 439be0e..b5bdc40 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
index 2183f83..4c82c2f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
index 8024738..c353361 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
index 42fb5f1..73560cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
index 0503dee..288f81b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/interceptors-inheritance/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
index db9f833..83fd073 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
index b85cd87..3d9fd86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 import java.lang.reflect.*;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
index 7bdc0a3..a2550d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
index dc44dde..8a21559 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
index cb66ca0..18b48ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
index c13d9aa..d418ee0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
index 95a7ba8..c0f50c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
index 9538786..b66e326 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.Interceptors;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
index 0e340d7..87f55cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean2.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
index 1daebb1..3ca7de0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/annotation/ejb/SomeManagedBean3.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.annotation.Resource;
 import javax.interceptor.ExcludeClassInterceptors;
 import javax.interceptor.Interceptors;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
index db9f833..83fd073 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import javax.naming.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 
 public class Client {

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
index f47eb43..9a6d8d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/BaseBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 import java.lang.reflect.*;

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
index 4d57156..cc04f28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SfulEJB.java
@@ -21,7 +21,7 @@
 import javax.interceptor.Interceptors;
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
index dfe71af..c3d5166 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.interceptor.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
index 852a841..b61f44e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
index 94148fb..5b392da 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
index 16d3e9a..7c9aeaf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/SlessEJB3.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java
index e1983ce..32f548d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/interceptors/lc-method-constructor-level/descriptor/ejb/Snglt.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Snglt {
     public String hello();
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java
index 77f88ce..314d8e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/client/Client.java
@@ -16,7 +16,7 @@
 
 package client.intrfaces;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import admin.AdminBaseDevTest;

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java
index e934568..a932582 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB1.java
@@ -16,9 +16,9 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 
 /*
     St1 can not be both local and remote

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java
index cad3dd3..2b07663 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/NegEJB2.java
@@ -16,8 +16,8 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
 
 /*
     St7 can not be both local and remote

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java
index 3446aae..1bb55b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 /*

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java
index af35fe1..32f43d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/SingletonBean1.java
@@ -16,7 +16,7 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 /*

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java
index 1fdcf92..c4441a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St6.java
@@ -16,7 +16,7 @@
 
 package ejb32.intrfaces;
 
-@javax.ejb.Local
+@jakarta.ejb.Local
 public interface St6 {
 
     public String st6() throws Exception;

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java
index 4515a12..19dfa3c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/St7.java
@@ -16,7 +16,7 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface St7 {

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java
index 880275a..87d8f6e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB.java
@@ -17,9 +17,9 @@
 package ejb32.intrfaces;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateful;
 
 /*
    StflEJB exposes remote interface St7. St5 isn't business interface.

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java
index e0ea36a..52ef5e1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB1.java
@@ -20,7 +20,7 @@
     StflEJB1 exposes local interfaces St4 & St3
  */
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful
 public class StflEJB1 implements St3, St4 {

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java
index 6041ca0..2361aae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StflEJB2.java
@@ -16,8 +16,8 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
 /*
     StflEJB2 exposes local interfaces St4 and St6. St5 isn't business interface
  */

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java
index 45c0d13..40cbfb6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB.java
@@ -17,7 +17,7 @@
 package ejb32.intrfaces;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java
index 39f4f57..89b563b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB1.java
@@ -16,8 +16,8 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Stateless;
 /*
     StlesEJB1 exposes no-interface view, local interface St6, remote interface St7.
     St5 isn't business interface

appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java
index 6821cd1..56428c1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/intfces/ejb/StlesEJB2.java
@@ -16,8 +16,8 @@
 
 package ejb32.intrfaces;
 
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 /*
     StlesEJB2 exposes remote interface St7. St3 isn't business interface
  */

appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
index 8b3b11c..b6e7a64 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ModernBean.java
@@ -20,9 +20,9 @@
 import com.sun.s1asdev.ejb.ejb32.mdb.ra.CommandListener;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.MessageDrivenContext;
 import javax.interceptor.Interceptors;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java
index 0236fd3..4622ee1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsBean.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
 
-import javax.ejb.LocalBean;
-import javax.ejb.Lock;
-import javax.ejb.LockType;
-import javax.ejb.Singleton;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Lock;
+import jakarta.ejb.LockType;
+import jakarta.ejb.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;

appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java
index 77808c0..828f191 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/mdb/ejb/ResultsRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.mdb.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.List;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
index 1ed04fa..0f62d41 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/client/Client.java
@@ -16,7 +16,7 @@
 
 package client.methodintf;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import ejb32.methodintf.St;

appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
index 3591c06..080364b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package ejb32.methodintf;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java
index 68b3623..8ec6ccd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/St.java
@@ -16,7 +16,7 @@
 
 package ejb32.methodintf;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface St {
 
     public void test() throws Exception;

appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
index dd1033d..e404df1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StfulEJB.java
@@ -16,7 +16,7 @@
 
 package ejb32.methodintf;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
index 04063cd..48b54ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/methodintf/ejb/StlesEJB.java
@@ -16,7 +16,7 @@
 
 package ejb32.methodintf;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.interceptor.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
index f8eb8ec..e3a0692 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/client/Client.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.disallowed_methods.ejb.Tester;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
index 0b88816..ad2464c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/SlessBean.java
@@ -19,7 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.LockModeType;
 import javax.persistence.PersistenceContext;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java
index 1f299a6..ca68878 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/disallowed_methods/ejb/Tester.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Tester {

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
index 507fe8d..65a2abc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb.Tester;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java
index 2a40a89..825aca4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1Finder.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface TC1Finder extends EJBLocalObject{
     Person findPerson(String name);

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java
index de8610f..ec1d7ac 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1FinderHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface TC1FinderHome extends EJBLocalHome{
     public TC1Finder createFinder() throws CreateException;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
index e027922..7b24a9e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithSynchPC.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.Init;
-import javax.ejb.LocalHome;
-import javax.ejb.Stateful;
+import jakarta.ejb.Init;
+import jakarta.ejb.LocalHome;
+import jakarta.ejb.Stateful;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceContextType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
index 1096d45..ff14458 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC1SfsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateful;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceContextType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java
index 6b4b4e4..8f44efb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2Finder.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface TC2Finder extends EJBLocalObject{
     Person findPerson(String name);

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java
index 3412751..b173883 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2FinderHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface TC2FinderHome extends EJBLocalHome{
     public TC2Finder createFinder() throws CreateException;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
index 72a422e..d3c3080 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithSynchPC.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateful;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceContextType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
index 00035cd..41ae2a9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/TC2SfsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.Init;
-import javax.ejb.LocalHome;
-import javax.ejb.Stateful;
+import jakarta.ejb.Init;
+import jakarta.ejb.LocalHome;
+import jakarta.ejb.Stateful;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceContextType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java
index c70aa27..3626c14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/extendedscope_cross_sfsb/ejb/Tester.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.extendedscope_cross_sfsb.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Tester {

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
index b015a2f..0af4cff 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.ejb.Tester;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
index a35f3a2..8cf3554 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/SlessBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.ejb;
 
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java
index 33d73e0..d5ffaf5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/rollback_notclear_unsynchPC/ejb/Tester.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.rollback_notclear_unsynchPC.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Tester {

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
index 26eb91e..0cc3be9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb.Tester;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java
index 26dadb9..6346d47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Finder.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 @Local
 public interface Finder {

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
index aba5364..22494e3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/SlsbWithSynchPC.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
index 68d3fb6..0ac7247 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC1SfsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateful;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
index 772a88e..3c95c3b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC2SlsbWithUnsynchPC.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
index 41edfb5..ce84ab6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithSynchPC.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
index 6841193..bc127df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC3SlsbWithUnSynchPC.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
index 8eaf62a..78e943d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SfsbWithUnsynchPC.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
index 1f9e0d9..d35d203 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/TC4SlsbWithSynchPC.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java
index 3a4ddb9..edf77d1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/txscope_synctype_mismatch/ejb/Tester.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.txscope_synctype_mismatch.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Tester {

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
index 1dc3c7c..6ed9ff8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb.Tester;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
index 1b298b4..627eb63 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/SLSBWithUnsynchPC.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.SynchronizationType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
index 5a78a4e..c3a048b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/unsynchpc_flush/ejb/Tester.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.unsynchpc_flush.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Tester {

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java
index 45377b1..5ade34f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/client/Client.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 import com.sun.s1asdev.ejb.ejb32.persistence.unsynchronizedPC.use_nonjtadatasource.ejb.Tester;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
index 5e47414..26d6f50 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SfulBean.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceContextType;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
index 2a16f09..d2bc8ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/SlessBean.java
@@ -21,11 +21,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 import javax.transaction.UserTransaction;

appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java
index 809b883..082f8f7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/persistence/unsynchronizedPC/use_nonjtadatasource/ejb/Tester.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Tester {

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
index a564a67..e75bfb7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java
index 1893d25..90f930f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Hello {
 
     String test(String value, int count);

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java
index 97aa3b4..906b75f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/Hello2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Hello2 {
 
     void testRemove();

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
index 783872c..0f41ca6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
index fba93b5..9df1d86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/basic/ejb/SLSB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
index 96879ec..b09b63f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
index d6926f6..a99a8f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/descriptor/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
index f00aacd..5bfa4db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java
index 8c9728b..4ff2e67 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Hello {
 
     String test();

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java
index 387b640..946f600 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello1.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Hello1 {
 
     String test();

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java
index 16e0fa6..77d1ee6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/Hello2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface Hello2 {
 
     String test();

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
index be13c49..6d6dffd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
index 22f4216..b0c8bcc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB1.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
index d0172f5..4b21f22 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/sfsb/lifecycle_cb_txattr/ejb/SFSB2.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.annotation.*;
 

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
index 20aa4e3..e39c707 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb32.timer.getalltimers;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java
index a5d446e..630fc3e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/SingletonTimeoutEJB.java
@@ -17,15 +17,15 @@
 package com.acme.ejb32.timer.getalltimers;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Schedule;
-import javax.ejb.Schedules;
-import javax.ejb.Singleton;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerConfig;
-import javax.ejb.TimerService;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.Schedules;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerConfig;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Singleton
 public class SingletonTimeoutEJB {

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java
index 85e083a..64d8b1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeout.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb32.timer.getalltimers;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface StlesNonTimeout {
 
     public void verifyAllTimers() throws Exception;

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
index 89e1c89..a0f64f0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesNonTimeoutEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb32.timer.getalltimers;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 import java.util.Set;

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java
index 9ec0e0c..3b84657 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeout.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb32.timer.getalltimers;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface StlesTimeout {
 
     public void createProgrammaticTimers();

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java
index 6cf278c..fb784ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/getalltimers/ejb/StlesTimeoutEJB.java
@@ -16,7 +16,7 @@
 
 package com.acme.ejb32.timer.getalltimers;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 import java.util.Map;

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java
index 34df051..b6dca0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/client/Client.java
@@ -17,7 +17,7 @@
 package com.acme.ejb32.timer.opallowed;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java
index ba95660..f76b1a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeout.java
@@ -16,9 +16,9 @@
 
 package com.acme.ejb32.timer.opallowed;
 
-import javax.ejb.Remote;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
 
 @Remote
 public interface SingletonTimeout {

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
index 57369b6..045234c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutEJB.java
@@ -17,15 +17,15 @@
 package com.acme.ejb32.timer.opallowed;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Schedule;
-import javax.ejb.ScheduleExpression;
-import javax.ejb.Schedules;
-import javax.ejb.Singleton;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerConfig;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
+import jakarta.ejb.Schedule;
+import jakarta.ejb.ScheduleExpression;
+import jakarta.ejb.Schedules;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerConfig;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
 
 @Singleton
 public class SingletonTimeoutEJB implements SingletonTimeoutLocal, SingletonTimeout {

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java
index 0e3721b..cd9a51d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/SingletonTimeoutLocal.java
@@ -16,9 +16,9 @@
 
 package com.acme.ejb32.timer.opallowed;
 
-import javax.ejb.Local;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Local;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
 
 @Local
 public interface SingletonTimeoutLocal {

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java
index 95ef656..42997e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/ejb/TimeoutHelper.java
@@ -16,8 +16,8 @@
 
 package com.acme.ejb32.timer.opallowed;
 
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
 
 public class TimeoutHelper {
     // this is to test the APIs allowed to be invoked

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java
index 3fc835d..70a73a6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/MngTimeoutBean.java
@@ -17,9 +17,9 @@
 package com.acme.ejb32.timer.opallowed;
 
 import jakarta.annotation.ManagedBean;
-import javax.ejb.EJB;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
 
 @ManagedBean("MngBean")
 public class MngTimeoutBean {

appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
index fad6e53..bec561a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejb32/timer/opallowed/war/VerifyServlet.java
@@ -17,11 +17,11 @@
 package com.acme.ejb32.timer.opallowed;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
index 6136fa3..397a553 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
index 14680e5..8f1c9d2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.equals;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
index 2dc6d86..555fe48 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 
@@ -165,7 +165,7 @@
             try {
                 cont.assertValidRemoteObject(sc.getEJBObject());
                 System.out.println("Assertion of my ejb object succeeded");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 e.printStackTrace();
                 throw e;
             }
@@ -173,42 +173,42 @@
             try {
                 cont.assertValidRemoteObject(null);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidRemoteObject(this);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidRemoteObject(home);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidRemoteObject(hr);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidRemoteObject(hr2);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidRemoteObject(meLocal);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
@@ -219,7 +219,7 @@
             try {
                 cont.assertValidLocalObject(meLocal);
                 System.out.println("Assertion of my ejb local object succeeded");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 e.printStackTrace();
                 throw e;
             }
@@ -227,42 +227,42 @@
             try {
                 cont.assertValidLocalObject(null);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidLocalObject(hl);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidLocalObject(hl2);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidLocalObject(this);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidLocalObject(home);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
             }
 
             try {
                 cont.assertValidLocalObject(hr2);
                 throw new EJBException("assertion should have failed");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("Successfully caught the following exception:" + e.getMessage());
                 System.out.println("Successfully detected invalid ejb local object");
             }
@@ -327,7 +327,7 @@
             try {
                 cont.assertValidRemoteObject(sc.getEJBObject());
                 System.out.println("assertValidRemoteObject: Successfully compared (ejbo1 == ejo1)");
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 e.printStackTrace();
                 System.out.println("assertValidRemoteObject: Failed (ejbo1 == ejbo1)");
                 return "Failed same EJBObject assert: " + e;
@@ -338,7 +338,7 @@
                 String str = "Comparison of (ejbo and home) should have failed";
 		System.out.println(str);
 		return str;
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
             }
 
@@ -347,7 +347,7 @@
                 String str = "Comparison of (ejbo and null) should have failed";
 		System.out.println(str);
 		return str;
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
             }
 
@@ -356,7 +356,7 @@
                 String str = "Comparison of (ejbo and bean) should have failed";
 		System.out.println(str);
 		return str;
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
             }
 
@@ -365,7 +365,7 @@
                 String str = "Comparison of (ejbo and ejbo_from_diff_container) should have failed";
 		System.out.println(str);
 		return str;
-            } catch(javax.ejb.EJBException e) {
+            } catch(jakarta.ejb.EJBException e) {
                 System.out.println("assertValidRemoteObject: Successfully caught expected exception:" + e.getMessage());
             }
 

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java
index ef82fd1..e69dadc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome, FooHomeSuper, FooHomeSuperOther {

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java
index 0c6e5fd..b978ffb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooHomeSuperOther.java
@@ -20,5 +20,5 @@
 import java.rmi.RemoteException;
 
 public interface FooHomeSuperOther extends java.rmi.Remote {
-    Foo create() throws RemoteException, javax.ejb.CreateException;
+    Foo create() throws RemoteException, jakarta.ejb.CreateException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java
index 7e84b4e..f81a041 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.equals;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface FooLocal extends EJBLocalObject {
     void callHello();

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java
index 7e31051..228b9d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejbc.equals;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooLocalHome extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java
index ed6975a..73846a4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/FooSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.equals;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
index ecb388d..b4eb94f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.equals;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java
index 6023e81..31b8f2b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloHome.java
@@ -19,10 +19,10 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {
-    Hello create () throws RemoteException, javax.ejb.FinderException, CreateException;
+    Hello create () throws RemoteException, jakarta.ejb.FinderException, CreateException;
 }

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java
index 0a9fab0..a9762d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.equals;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface HelloLocal extends EJBLocalObject {
     void callHello();

appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java
index cbcf141..d447dd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/equals/ejb/HelloLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejbc.equals;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloLocalHome extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
index ea1726c..4a8ce18 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java
index 4d8ace0..2500192 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.redef;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
index 8bc528f..71580c9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java
index 593f5af..a91a9dc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHome.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface FooHome extends EJBHome, FooHomeSuper {

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
index e6a9c6c..eb0530c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooHomeSuper.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface FooHomeSuper extends Remote {

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java
index f89cc7f..acc621b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.redef;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface FooLocal extends FooLocalSuper {
 

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java
index e5e201e..5e336ec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHome.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejbc.redef;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.RemoveException;
 
 
 public interface FooLocalHome extends EJBLocalHome, FooLocalHomeSuper {

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java
index efd394a..c3ced4a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalHomeSuper.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejbc.redef;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.RemoveException;
 
 
 public interface FooLocalHomeSuper {

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java
index 67ae541..df2e11c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooLocalSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.redef;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface FooLocalSuper extends EJBLocalObject {
     void callHello();

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java
index b91c260..4f5ab8a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/FooSuper.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.redef;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java
index 6bdcee0..3aebfcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java
index 0128ee4..875ce34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java
index a3b53fa..d82be52 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface HelloLocal extends EJBLocalObject {
     void callHello();

appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java
index 30622cb..f0f2c31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/redef/ejb/HelloLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloLocalHome extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
index 25c6ff7..9b5f3e8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java
index e069286..8ef4603 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
index 159c476..4b705ee 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java
index f633974..9560e43 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java
index dbb0c09..0de3813 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface FooLocal extends EJBLocalObject {
     void callHello();

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java
index e11c3b3..32f200e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/FooLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooLocalHome extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java
index 6bdcee0..3aebfcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java
index 0128ee4..875ce34 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java
index a3b53fa..d82be52 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface HelloLocal extends EJBLocalObject {
     void callHello();

appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java
index 30622cb..f0f2c31 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/ejbc/sameimpl/ejb/HelloLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejbc.sameimpl;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloLocalHome extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java
index 3858e28..ee94000 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.jms.jmsejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
index f3ad6a9..7e7f4d6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloBean.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.jms.jmsejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java
index 9dd444d..8bc6629 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java
index ab80247..ea6600e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.jms.jmsejb2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
index d8522bd..20aeeeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloBean.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.jms.jmsejb2;
 
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java
index 5dfa4b5..d11da37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/jms/jmsejb2/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
index 5c42b13..ec031e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
index 7f3c36f..0154e22 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/cmt/ejb/MessageBean.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 public class MessageBean  

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
index 7daac5a..59da90d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/MsgBean.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.mdb.msgbean;
 
 import java.util.Vector;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
index 39a6701..6feac86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTest.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.mdb.msgbean;
 
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.transaction.UserTransaction;

appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
index c790707..9ddef0e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/msgbean/ejb/OperationTestMsgBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.mdb.msgbean;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import jakarta.jms.Message;
 import jakarta.jms.MessageListener;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
index 4422a9b..c918e9b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/client/Client.java
@@ -20,7 +20,7 @@
 import javax.naming.*;
 import jakarta.jms.*;
 import jakarta.annotation.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import com.sun.s1asdev.ejb.mdb.singleton.FooRemoteIF;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java
index ea94418..d16033d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.mdb.singleton;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 @Stateless

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java
index 651cf36..2e5aba4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/FooRemoteIF.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1asdev.ejb.mdb.singleton;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
-@javax.ejb.Remote
+@jakarta.ejb.Remote
 public interface FooRemoteIF {
     public String foo();
     public List<String> getMessageBeanInstances();

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
index 3b40a7f..b9b67c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/MessageBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.mdb.singleton;
 
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class MessageBean implements  MessageListener {
     @EJB

appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java
index 8b9d0bd..94c5266 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/mdb/singleton/ejb/StatusBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.mdb.singleton;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**

appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
index c68e346..46ada94 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java
index 9986972..1a03b7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Bmp.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Bmp extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
index 2d4fa41..cbc28cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class BmpEJB implements EntityBean
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java
index 5a7577b..3688d01 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface BmpHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java
index 2000386..90d2605 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BmpRemote extends CommonRemote

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
index 28fadc7..5dec60c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/BmpRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BmpRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java
index c6c8338..e3b7efa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Common.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Common extends EJBLocalObject
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java
index 3c3a4e4..1828cef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/CommonRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface CommonRemote extends EJBObject

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java
index 2dd71b8..c3f8fa3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface Hello extends EJBObject

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
index 493f5e0..5a8aac5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java
index c32f970..99388a3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java
index dc16e0a..81a564d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sful extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
index bbda07a..bdb44b1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class SfulEJB implements SessionBean
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java
index 31138cf..1ff286d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface SfulHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java
index 80901a1..ebc5320 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SfulRemote extends CommonRemote
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java
index a429d9e..d3a76b4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SfulRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java
index 2e01c9e..33d3f21 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sless extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
index 0fc8208..cf5b7d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class SlessEJB implements SessionBean
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java
index 24447e2..80dd1b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessHome extends EJBLocalHome
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java
index d99cb78..389ecbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessRemote extends CommonRemote
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java
index 61b84f9..b8c518e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SlessRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
index c1b1c57..3805e03 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java
index 9c92e70..7d9cb0c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Bmp.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Bmp extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
index 3d347f1..2183b29 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class BmpEJB implements EntityBean
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java
index 6afa58c..b116406 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/BmpHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface BmpHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java
index 18e13f4..d7d92d3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Common.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Common extends EJBLocalObject
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java
index f1e5bec..790534b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface Hello extends EJBObject

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
index 532377f..2c8ccc9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java
index 1f38bec..c8769f8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java
index d07c3ba..0a1212b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sful extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
index 3fe370b..3648c86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class SfulEJB implements SessionBean
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java
index d4b1014..81eb697 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SfulHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface SfulHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java
index 6189d5e..e83df18 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sless extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
index 62a1a7d..92328cb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class SlessEJB implements SessionBean
 {

appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java
index 1de02c1..e781cca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/local2/ejb/SlessHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.local2;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessHome extends EJBLocalHome
 {

appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
index 85a3990..f89ef88 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/client/Client.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.perf.timer1;
 
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
index d764912..1ae84cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.timer1;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Remote
 public interface TimerSession {

appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
index 6f2f4d4..b4b01d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/perf/timer1/ejb/TimerSessionEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.perf.timer1;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 import jakarta.annotation.*;
 import java.util.Date;

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
index 3d823ae..7cf5e8e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/client/Client.java
@@ -20,7 +20,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
index fa23a54..f9de77c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
index adbfff6..5298e37 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
index 2fb8230..2a457eb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
index f5489a9..b9a73d0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java
index 2e48dfb..ce40249 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java
index 11b9090..eb6c91a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocal

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java
index d3d657b..0bdbdc8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocalHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java
index 570da27..b199220 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/cacheNPE/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.cacheNPE.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityRemote

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
index 9e9950e..02d4cec 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/client/Client.java
@@ -20,7 +20,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.sfsb.keepstate.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
index 1a34870..5e697cd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
index aacbd1b..139b5bd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
index a8b0eb3..fa34638 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
index 962d0f4..76ce881 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SFSBLocal
     extends EJBLocalObject

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
index 37af905..0502a12 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBLocalHome
     extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
index 7845801..4e5612c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java
index 18c6ec3..f8a8a83 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java
index f610fc2..f6141e6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocal

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java
index 7537e27..4f3edba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocalHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java
index 6fb2c23..55e6e00 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.keepstate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityRemote

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
index f978a62..4f182ae 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/client/Client.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java
index 5538b45..112e556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/LifecycleListener.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.PostActivate;
+import jakarta.ejb.PostActivate;
 
 public class LifecycleListener {
 

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
index d684faf..9a11488 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
index adfb28a..6bbbc9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java
index 09f799a..68fbb1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
index a8e476e..87715be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SFSBLocal
     extends EJBLocalObject

appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
index e4a01d9..b88dc2d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/keepstate/listener/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBLocalHome
     extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
index fec8470..a3c0f2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/client/Client.java
@@ -19,7 +19,7 @@
 import java.util.ArrayList;
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
index fdbbb87..2b4a211 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
index cb6cb8a..5a1bf55 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
index 44bf2f6..4c636b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
index 455a32b..b54aca7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SFSBLocal
     extends EJBLocalObject

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
index 9d51e95..c91cb9d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBLocalHome
     extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
index bdf6ba8..c9e4eca 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java
index 823ee63..3e78ef4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java
index f8a0924..3c39534 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocal

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java
index 8c625b3..eb22d16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocalHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java
index bedde17..bd515ba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityRemote

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
index 25d2cef..6c1c63a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/client/Client.java
@@ -20,7 +20,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java
index 5538b45..112e556 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/LifecycleListener.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.PostActivate;
+import jakarta.ejb.PostActivate;
 
 public class LifecycleListener {
 

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
index d684faf..9a11488 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
index adfb28a..6bbbc9a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBEJB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java
index 09f799a..68fbb1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
index a8e476e..87715be 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SFSBLocal
     extends EJBLocalObject

appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
index e4a01d9..b88dc2d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/passivateactivate/listener/ejb/SFSBLocalHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.sfsb.lifecycle.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBLocalHome
     extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
index d56fcce..d61571b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/Client.java
@@ -20,7 +20,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.sfsb.stress.ejb.StressSFSBHome;

appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
index 3fcf1f7..725d2c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/LoadGenerator.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.stress.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.Properties;

appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
index 46bd034..c635849 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/client/StressSFSBClient.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.stress.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.Properties;

appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
index 4a19a4c..fa62bbf 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.sfsb.stress.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface StressSFSB

appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
index 4cf8e1e..1b75a9c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.ejb.sfsb.stress.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
index d918896..758c2aa 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/sfsb/stress/ejb/StressSFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.sfsb.stress.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface StressSFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
index d0827f1..2ce8a0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/client/Client.java
@@ -20,7 +20,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.stress.passivateactivate.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
index 7357f83..35fbf08 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stress.passivateactivate.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
index ed954f8..8b2ec1d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.stress.passivateactivate.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
index b6a3512..7ebf5c3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/passivateactivate/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.stress.passivateactivate.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
index 5211d07..af3c018 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/client/Client.java
@@ -20,7 +20,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.stress.sfsbcache.ejb.SFSBHome;

appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
index 8407548..0ba4040 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stress.sfsbcache.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SFSB

appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
index 6cd5536..f0f1e14 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.stress.sfsbcache.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
index f788ba7..6ba094a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stress/sfsbcache/ejb/SFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.stress.sfsbcache.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
index 1cc6600..0eebc28 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.ejbapp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/appclient/client/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
index fcf7863..a9e97c4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/client/Client.java
@@ -19,7 +19,7 @@
 import java.net.*;
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
index 2666eac..7d38921 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/DummyMEJBBean.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 
 import java.util.*;
 //import javax.management.*;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java
index 768ec84..2c5a7b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.ejbapp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
index 73d43b1..1581ec6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java
index cbbd6ee..395311c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.ejbapp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
index 3285300..38f037d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 
 
 public class HelloBean implements SessionBean {

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.ejbapp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbapp/servlet/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
index 757fb97..722a053 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java
index e37ba90..09995fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.ejbclient;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
index a644ee7..c627064 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import com.sun.s1asdev.ejb.stubs.ejbapp.HelloHome;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java
index 588ed0a..fadac0b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.ejbapp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/ejbclient/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
index 809797c..b6fd438 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;
@@ -95,7 +95,7 @@
         try {
             h.throwAppException1();
             throw new Exception("didn't get exception for testException2");
-        } catch(javax.ejb.FinderException e) {
+        } catch(jakarta.ejb.FinderException e) {
             System.out.println("Successfully caught exception " + 
                                e.getClass() + " " + e.getMessage());
         }
@@ -103,7 +103,7 @@
         try {
             h.throwAppException2();
             throw new Exception("didn't get exception for testException3");
-        } catch(javax.ejb.FinderException e) {
+        } catch(jakarta.ejb.FinderException e) {
             System.out.println("Successfully caught exception " + 
                                e.getClass() + " " + e.getMessage());
         }

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java
index e2fdefa..b8a35a2 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Bmp.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Bmp extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
index a765426..ed480b5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class BmpEJB implements EntityBean
 {
@@ -75,12 +75,12 @@
 
     // throws some checked exception which is a subclass of the declared
     // checked exception
-    public void testException3() throws javax.ejb.FinderException {
+    public void testException3() throws jakarta.ejb.FinderException {
         throw new ObjectNotFoundException("testException3");
     }
 
     // throws some checked exception
-    public void testException4() throws javax.ejb.FinderException {
+    public void testException4() throws jakarta.ejb.FinderException {
         throw new FinderException("testException4");
     }
 

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
index b67345e..3e4cb7d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface BmpHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java
index b745cac..87c90cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BmpRemote extends CommonRemote

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
index e53db9d..c3f29fc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/BmpRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface BmpRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java
index d71d828..0346192 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Common.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Common extends EJBLocalObject
 {
@@ -42,5 +42,5 @@
     void testException2();
 
     // throws some checked exception
-    void testException3() throws javax.ejb.FinderException;
+    void testException3() throws jakarta.ejb.FinderException;
 }

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java
index c6dfb34..c9d7597 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/CommonRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface CommonRemote extends EJBObject
@@ -43,9 +43,9 @@
     void testException2() throws RemoteException;
 
     // throws some checked exception
-    void testException3() throws javax.ejb.FinderException, RemoteException;
+    void testException3() throws jakarta.ejb.FinderException, RemoteException;
 
-    void testException4() throws javax.ejb.FinderException, RemoteException;
+    void testException4() throws jakarta.ejb.FinderException, RemoteException;
 
 
     void testPassByRef1(int a) throws RemoteException;

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java
index 7ef7f42..8182c2c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface Hello extends EJBObject

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
index db9a2d6..6a8627e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 import javax.rmi.PortableRemoteObject;
@@ -114,7 +114,7 @@
             slessHome.remove(sless);
             throw new EJBException("expecting remove exception when " +
                                    "removing sless bean through EJBLocalHome");
-        } catch(javax.ejb.RemoveException e) {
+        } catch(jakarta.ejb.RemoveException e) {
             System.out.println("Successfully caught RemoveException for " +
                                "sless local home");
             // success
@@ -124,7 +124,7 @@
             sfulHome.remove(sful);
             throw new EJBException("expecting remove exception when " +
                                    "removing sful bean through EJBLocalHome");
-        } catch(javax.ejb.RemoveException e) {
+        } catch(jakarta.ejb.RemoveException e) {
             System.out.println("Successfully caught RemoveException for " +
                                "sful local home");
             // success
@@ -152,7 +152,7 @@
             slessRemoteHome.remove(slessRemote);
             throw new EJBException("expecting remove exception when " +
                                    "removing sless bean through EJBHome");
-        } catch(javax.ejb.RemoveException e) {
+        } catch(jakarta.ejb.RemoveException e) {
             System.out.println("Successfully caught RemoveException for " +
                                "sless home");
             // success
@@ -162,7 +162,7 @@
             sfulRemoteHome.remove(sfulRemote);
             throw new EJBException("expecting remove exception when " +
                                    "removing sful bean through EJBHome");
-        } catch(javax.ejb.RemoveException e) {
+        } catch(jakarta.ejb.RemoveException e) {
             System.out.println("Successfully caught RemoveException for " +
                                "sful home");
             // success

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java
index 6a71212..cac08db 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java
index 1ea7c3a..828ce1f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sful extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
index a68deb0..e416915 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class SfulEJB implements SessionBean
 {
@@ -63,12 +63,12 @@
 
     // throws some checked exception which is a subclass of the declared
     // checked exception
-    public void testException3() throws javax.ejb.FinderException {
+    public void testException3() throws jakarta.ejb.FinderException {
         throw new ObjectNotFoundException("testException3");
     }
 
     // throws some checked exception
-    public void testException4() throws javax.ejb.FinderException {
+    public void testException4() throws jakarta.ejb.FinderException {
         throw new FinderException("testException4");
     }
 

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java
index f9a9803..b5e233e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface SfulHome extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java
index 2536828..3278365 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SfulRemote extends CommonRemote
 {}

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java
index b04ebde..357718f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SfulRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SfulRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java
index e058296..d8c9e86 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/Sless.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Sless extends Common
 {}

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
index 929bc23..9be053e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessEJB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class SlessEJB implements SessionBean
 {
@@ -60,13 +60,13 @@
 
     // throws some checked exception which is a subclass of the declared
     // checked exception
-    public void testException3() throws javax.ejb.FinderException {
+    public void testException3() throws jakarta.ejb.FinderException {
         throw new ObjectNotFoundException("testException3");
     }
 
     // throws some checked exception
-    public void testException4() throws javax.ejb.FinderException {
-        throw new javax.ejb.FinderException("testException4");
+    public void testException4() throws jakarta.ejb.FinderException {
+        throw new jakarta.ejb.FinderException("testException4");
     }
 
     public void testPassByRef1(int a) {

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java
index a10bd42..1966150 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessHome extends EJBLocalHome
 {

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java
index d9c1065..8beeba1 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface SlessRemote extends CommonRemote
 {}

appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java
index c2ca11d..ab6b314 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/proxy/ejb/SlessRemoteHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.proxy;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SlessRemoteHome extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
index a07eaa3..421184b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Btest.java
@@ -24,8 +24,8 @@
 
 import javax.rmi.PortableRemoteObject;
 
-import javax.ejb.EJBHome;
-import javax.ejb.EJBMetaData;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.EJBMetaData;
 
 
 public class Btest{

appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
index 90593b8..93dd624 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/Client.java
@@ -19,9 +19,9 @@
 import java.io.*;
 import java.util.*;
 
-import javax.ejb.EJBHome;
-import javax.ejb.Handle;
-import javax.ejb.EJBMetaData;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.Handle;
+import jakarta.ejb.EJBMetaData;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
index ab9054f..2b3a40c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/standaloneclient/client/SimpleClient.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.standaloneclient;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.Properties;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java
index a8bce5c..ef15532 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo1.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java
index 8b242b7..fdb688a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo10.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java
index c4a293e..3ac5b4f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java
index 877e91d..5297b62 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo3.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java
index 9bebf60..47fc833 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo4.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java
index 3d4a33c..3b94f7b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo5.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java
index 2d553db..f15bf44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo6.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java
index ecb2b8c..856c4a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo7.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java
index cb22d6e..41e2193 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo8.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java
index 0af6f00..0cfc171 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/Foo9.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubcount;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
index e9e703e..144d448 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java
index 6ddf980..3990f1a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome1.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome1 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java
index 9c4e528..f3e2295 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome10.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome10 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java
index a2b2823..a6c6c46 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome2.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome2 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java
index 913dc17..fe1896a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome3.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome3 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java
index 5479433..05b4489 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome4.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome4 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java
index 1663f65..74e30ea 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome5.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome5 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java
index c073eea..d540393 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome6.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome6 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java
index d01a3f9..fbfece0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome7.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome7 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java
index 0fdf3bf..ffe7328 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome8.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome8 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java
index 800a9cd..83eafcb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubcount/ejb/FooHome9.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome9 extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
index bdadd51..157bb8d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java
index fbce365..3a3c662 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubser;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
index bf2a039..22143f9 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooBean.java
@@ -20,10 +20,10 @@
 import java.util.Collection;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.TimerService;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java
index ae3a353..1bcdbce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java
index e42675c..c6a64a0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.stubser;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
index 2294904..8713eba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 
 
 public class HelloBean implements SessionBean {

appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java
index ed7c59a..b5de23c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/stubser/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java
index 554f8a6..d23f12a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.stubs.ejbapp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java
index 147fd94..759f1e0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/servlet/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
index bfe50b5..2e12c42 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/descriptor/ejb-jar.xml
@@ -61,7 +61,7 @@
         <ejb-name>MDB1</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
index 40bdf3c..ba895ed 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/mdbtimer/ejb/MessageBean.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.Date;
 

appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
index a2eda9f..fe5c5c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.HashSet;
 import java.util.Set;

appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
index 0d22a74..9c8459e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/descriptor/ejb-jar.xml
@@ -56,7 +56,7 @@
         <ejb-name>TimerSessionEJB</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
index ae79127..b67ce95 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.restore;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface TimerSession extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
index 032a037..9d4b1c7 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionEJB.java
@@ -18,13 +18,13 @@
 
 import java.util.Iterator;
 import java.util.Date;
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import jakarta.jms.Session;
 import java.rmi.RemoteException;
 import jakarta.jms.QueueConnectionFactory;

appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
index e75b3ce..1c04f5d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/restore/ejb/TimerSessionHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.timer.restore;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface TimerSessionHome extends EJBHome {
 	TimerSession create() throws CreateException, RemoteException;

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
index 342546a..7f525df 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/client/Client.java
@@ -21,7 +21,7 @@
 
 import java.util.concurrent.*;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import com.sun.s1asdev.ejb.timer.sessiontimer.TimerSession;
 import com.sun.s1asdev.ejb.timer.sessiontimer.TimerSessionHome;

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml
index ac49c92..0a40707 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/descriptor/ejb-jar.xml
@@ -45,7 +45,7 @@
         <ejb-name>TimerSessionEJB</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
index c03a280..0ea8635 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.sessiontimer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface TimerSession extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
index a520ce1..3262ecb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionEJB.java
@@ -16,13 +16,13 @@
 
 package com.sun.s1asdev.ejb.timer.sessiontimer;
 
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBContext;
 import java.rmi.RemoteException;
 import javax.naming.*;
 

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
index d49657e..14113b3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSessionHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.timer.sessiontimer;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface TimerSessionHome extends EJBHome {
 	TimerSession create() throws CreateException, RemoteException;

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
index 8412534..b2e5d16 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingleton.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.sessiontimer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.concurrent.*;
 
 @Singleton

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
index 868beda..4594dda 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimer/ejb/TimerSingletonRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.sessiontimer;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @Remote
 public interface TimerSingletonRemote {

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
index 4ccdd00..9edcdf0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 import com.sun.s1asdev.ejb.timer.sessiontimersecurity.TimerSession;
 import com.sun.s1asdev.ejb.timer.sessiontimersecurity.TimerSessionHome;

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
index c50a697..790cc38 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/descriptor/ejb-jar.xml
@@ -57,7 +57,7 @@
         <ejb-name>TimerSessionEJB</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -73,7 +73,7 @@
         <ejb-name>TimerSessionEJB</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
index 7675011..acfc21a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.sessiontimersecurity;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface TimerSession extends EJBObject {

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
index 5339924..e205ecc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionEJB.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb.timer.sessiontimersecurity;
 
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import jakarta.jms.Session;
 import java.rmi.RemoteException;
 import jakarta.jms.QueueConnectionFactory;

appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
index 9e95f74..c5ddff3 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/sessiontimerSecurity/ejb/TimerSessionHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.timer.sessiontimersecurity;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface TimerSessionHome extends EJBHome {
 	TimerSession create() throws CreateException, RemoteException;

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
index 8dcda82..e0c183d 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/client/Client.java
@@ -20,7 +20,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.s1asdev.ejb.timer.timerserialization.ejb.TimerSFSBHome;

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml
index 5ae3000..38cec84 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/descriptor/ejb-jar.xml
@@ -72,7 +72,7 @@
         <ejb-name>TimerSLSBEJB</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
index a69e5d9..a6f5a5b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface TimerSFSB

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
index 7767b75..4a1ad6b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBEJB.java
@@ -16,13 +16,13 @@
 
 package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
 
-import javax.ejb.TimedObject;
-import javax.ejb.NoSuchObjectLocalException;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.NoSuchObjectLocalException;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.*;

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
index 8ae7d7f..9c6f951 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSFSBHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface TimerSFSBHome
     extends EJBHome

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
index 17fa5f7..4016262 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface TimerSLSB
     extends EJBLocalObject

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
index 6c8247d..de0c8c5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBEJB.java
@@ -16,12 +16,12 @@
 
 package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
 
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 public class TimerSLSBEJB
     implements TimedObject, SessionBean 

appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
index c3a14e3..c65e500 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timerserialization/ejb/TimerSLSBHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.timer.timerserialization.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 public interface TimerSLSBHome
     extends EJBLocalHome

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
index 15d259e..3157547 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
index 6c4ed22..6f00dd0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/descriptor/ejb-jar.xml
@@ -299,7 +299,7 @@
         <ejb-name>msgbean_CMT</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>
@@ -317,7 +317,7 @@
         <ejb-name>FooEJB_CMT</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>
@@ -361,7 +361,7 @@
         <ejb-name>BarEJB_CMT</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-           <method-param>javax.ejb.Timer</method-param>
+           <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
index 91d71a9..897bb0a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Bar.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Bar extends EJBObject, TimerStuff {
     

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
index f1cc66e..48c3cf6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarEJB.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public abstract class BarEJB 
     extends TimerStuffImpl 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
index a756af2..aeee37f 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface BarHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
index db04a12..328c637 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/BarPrimaryKey.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.io.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class BarPrimaryKey implements Serializable
 {

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java
index e8e6058..cd8d8c0 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.timertests;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Foo extends EJBObject, TimerStuff {
 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
index d8d9ad6..7d0b388 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooEJB.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 
 public class FooEJB extends TimerStuffImpl implements SessionBean, TimedObject {

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java
index 3ebe3e2..8fd6608 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/FooHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface FooHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
index 28cad04..0cc8fcd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/MessageDrivenEJB.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class MessageDrivenEJB extends TimerStuffImpl 
     implements MessageDrivenBean, TimedObject, MessageListener {

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java
index a4c060e..e2373e4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/Stateful.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.timertests;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface Stateful extends EJBObject, TimerStuff {
 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
index 3e03458..efc9927 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulEJB.java
@@ -17,9 +17,9 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.*;
 
 
 public class StatefulEJB extends TimerStuffImpl implements SessionBean, SessionSynchronization {

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java
index f23a910..af04f7b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/StatefulHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.timer.timertests;
 
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface StatefulHome extends EJBHome {
     Stateful create(TimerHandle th) throws CreateException, RemoteException;

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
index a21a641..3df0cba 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuff.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.util.Date;
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface TimerStuff {
 

appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
index 484a5d6..e496337 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/timer/timertests/ejb/TimerStuffImpl.java
@@ -23,7 +23,7 @@
 import java.util.Date;
 import java.util.Collection;
 import java.util.Iterator;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.JMSException;
 import jakarta.jms.QueueConnectionFactory;
 import jakarta.jms.QueueConnection;

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
index 594413d..a39e98a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java
index c33f4d7..d11f14b 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.txprop.cmttimeout;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
index 257e50a..a9d12cc 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/FooBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import com.sun.s1asdev.ejb.txprop.cmttimeout.HelloHome;

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java
index 70e181f..9906a47 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.txprop.cmttimeout;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
index 3a88f5d..80a9db8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 
 
 public class HelloBean implements SessionBean {

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java
index b33c8cc..dedcaef 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
index aecfc84..ccd911c 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java
index a170e3f..c56a4b8 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityHome

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java
index 01c7cdf..9d8aa51 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocal

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java
index 709ff50..84dc19e 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityLocalHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityLocalHome

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java
index bb63e05..64c16dd 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleEntityRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.bmp;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleEntityRemote

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java
index 938400e..bc9be2a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.slsb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
index dc6beee..2717571 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 
 
 public class SimpleSLSBBean

appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java
index 85a6697..0d178f6 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/cmttimeout/ejb/SimpleSLSBHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.slsb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 

appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
index 8d9aa68..9eedeeb 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java
index 6dc3999..d9d4c44 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Foo.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.txprop.simple;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
index 19d3e5a..05982de 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooBean.java
@@ -20,10 +20,10 @@
 import java.util.Collection;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
-import javax.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.TimerService;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import javax.transaction.UserTransaction;

appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java
index ec05abd..5b12d35 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/FooHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java
index 5a91b7d..766a254 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.txprop.simple;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
index bf3ddf7..a2ebe78 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloBean.java
@@ -19,9 +19,9 @@
 import java.util.Enumeration;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 
 
 public class HelloBean implements SessionBean {

appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java
index 17cf1a4..d1a77e5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/txprop/simple/ejb/HelloHome.java
@@ -19,8 +19,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface HelloHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
index b5d7152..c30a6ce 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
@@ -34,10 +34,10 @@
         java.lang.Object.class,
         MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class, 
         MethodMapTest4.class, MethodMapTest3.class, MethodMapTest6.class,
-        MethodMapTest.class, javax.ejb.EJBHome.class, 
-        javax.ejb.EJBObject.class, javax.ejb.EJBLocalObject.class,
-        javax.ejb.EJBLocalHome.class, javax.ejb.SessionBean.class,
-        javax.ejb.EnterpriseBean.class, java.util.Map.class,
+        MethodMapTest.class, jakarta.ejb.EJBHome.class, 
+        jakarta.ejb.EJBObject.class, jakarta.ejb.EJBLocalObject.class,
+        jakarta.ejb.EJBLocalHome.class, jakarta.ejb.SessionBean.class,
+        jakarta.ejb.EnterpriseBean.class, java.util.Map.class,
         jakarta.jms.QueueConnection.class, jakarta.jms.QueueSession.class,
         jakarta.jms.Session.class, java.util.Date.class,
         javax.swing.Action.class, javax.swing.AbstractAction.class,

appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
index a538c06..4bb5274 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.webservice.commit;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 import jakarta.jws.WebService;
 import javax.sql.*;

appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
index 09d9371..9bfe341 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/ejb/CommitStatefulBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.webservice.commit;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.Resource;
 
 @Stateful

appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java
index f9a9b83..678759a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.webservice.ksink.googleserver;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
 
 public interface FooHome extends EJBHome {

appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java
index ea2f385..d3483f4 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/FooRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.webservice.ksink.googleserver;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface FooRemote extends EJBObject, GoogleSearchPort {

appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
index abdcc9f..a05a977 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/ejb/GoogleEJB.java
@@ -25,9 +25,9 @@
 import javax.xml.rpc.Call;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class GoogleEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java
index 8a35fd0..aebcc48 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.appauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
index 64d7c9d..23bc657 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.appauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java
index 0d87796..40cba18 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauth/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.appauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java
index e0db8ce..f7b7327 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.appauthtx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
index ea35908..d49233d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.appauthtx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java
index 1dd2c39..17a75cc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/appauthtx/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.appauthtx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java
index a89e85d..4afc080 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.autocommit.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
index 4d6fa2b..50f1766 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.autocommit.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java
index f0d300b..e7a250d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/autocommit/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.autocommit.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
index 04fc199..3e7e33b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTest.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.jdbc.cmpsimple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface BlobTest extends javax.ejb.EJBObject {
+public interface BlobTest extends jakarta.ejb.EJBObject {
     
     public String getName() throws java.rmi.RemoteException;
     

appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
index dc46eb1..7822a4a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.cmpsimple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -24,21 +24,21 @@
  */
 
 
-public abstract class BlobTestBean implements javax.ejb.EntityBean {
+public abstract class BlobTestBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -46,7 +46,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -54,7 +54,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: BlobTest ejbRemove");
@@ -62,7 +62,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -70,7 +70,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -78,7 +78,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -95,7 +95,7 @@
     public abstract void setBlb(byte[] b);
     
 
-    public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
         setId(id);
         setName(name);
         setBlb(b);
@@ -104,7 +104,7 @@
     }
     */  
     public java.lang.Integer ejbCreate(Integer id, java.lang.String name) 
-        throws javax.ejb.CreateException 
+        throws jakarta.ejb.CreateException 
     {
         setId(id);
         setName(name);
@@ -113,10 +113,10 @@
     }
   
     /*
-    public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+    public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
     }
     */
     
     public void ejbPostCreate(Integer id, java.lang.String name ) 
-        throws javax.ejb.CreateException {}
+        throws jakarta.ejb.CreateException {}
 }	

appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
index 7e7901b..562f1f5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cmpsimple/ejb/BlobTestHome.java
@@ -16,22 +16,22 @@
 
 package com.sun.s1asdev.jdbc.cmpsimple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface BlobTestHome extends javax.ejb.EJBHome {
+public interface BlobTestHome extends jakarta.ejb.EJBHome {
     /*    
-    public  BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     */
     public  BlobTest create(Integer i, java.lang.String name) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
     public  BlobTest findByPrimaryKey (Integer key) 
-        throws java.rmi.RemoteException, javax.ejb.FinderException;
+        throws java.rmi.RemoteException, jakarta.ejb.FinderException;
 }

appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java
index 3a64247..51d4374 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
index 94fb0c6..cd1d898 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java
index 55736d0..1a4cf1e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conncreationretry/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java
index 00bfff3..092f7d6 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface NestedBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java
index b051a10..86ba70b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java
index 0bdbb18..7551f20 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/NestedBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface NestedBMPHome

appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java
index 7f2e5f0..893d507 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java
index 0016690..81a9848 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import com.sun.appserv.jdbc.DataSource;
 

appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java
index 54d3810..8ddafb3 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connection-pool-perf/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java
index f113a0b..6fa8e98 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
index df28f3a..4857269 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;
@@ -26,7 +26,7 @@
         implements SessionBean {
 
     protected DataSource ds;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
 
     public void setSessionContext(SessionContext context) {
 	m_ctx = context;

appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleakreclaimnotify/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java
index 5b34022..aac554c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface SimpleBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
index 3bd8e60..98a69ed 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;
@@ -25,7 +25,7 @@
         implements SessionBean {
 
     protected DataSource ds;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
 
     public void setSessionContext(SessionContext context) {
 	m_ctx = context;

appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java
index 0426856..3eca924 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connleaktracing/ejb/SimpleBMPHome.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
 
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 
 public interface SimpleBMPHome
         extends EJBHome {

appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java
index d44b495..8bbc663 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java
index 1940e83..fbce741 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession2 extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
index 1a2ecaa..9c67853 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Bean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java
index f5e3a5d..c0762da 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSession2Home.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession2Home extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java
index d808309..1621b2b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
 import jakarta.annotation.Resource;
 import javax.naming.*;
 import javax.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import java.util.Set;
 import java.util.HashSet;

appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java
index d45f67e..1e41c2b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/nonxa/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.nonxa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java
index 0b4001f..b9b8f5f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java
index 5a0e84e..177efe1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession2 extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
index b688d08..3df9a79 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Bean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java
index c8af061..860b8eb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSession2Home.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession2Home extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
index 7034666..0579802 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java
index b31d0fd..c0f6e74 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/connsharing/xa/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connsharing.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java
index a4288c1..02500c9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
index 91da4b5..5ceec41 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java
index 468c5a0..c5b7a0b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java
index 3dfba15..beefc2c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
index 16f2bef..004b8d3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java
index 270d330..357503d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java
index 79a1fec..c73f7ce 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth1tx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
index 9f8c701..6fc6da8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth1tx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java
index 097f172..1bbe163 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauth1tx/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth1tx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java
index 1faf1fc..24c1a08 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauthtx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
index ffada48..f12be1f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauthtx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java
index e8de6ba..6fff2a0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/contauthtx/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauthtx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java
index b65d5b0..18b745c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.conval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java
index 328863b..7d83311 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.conval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java
index 5ef3b94..24b40c3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/conval/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.conval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java
index 3464e4f..f48e410 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.cpds.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
index 1d8f96b..99e1269 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.cpds.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java
index 97db125..fa42df2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpds/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.cpds.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java
index 1cce3cb..49f107f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.cpdsperf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
index 685813a..a08964d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.cpdsperf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java
index a1a1ada..2994a65 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/cpdsperf/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.cpdsperf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java
index 66a2ed7..38863d4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.customval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java
index f8b4fce..96940bd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.customval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java
index 1229443..b155b5b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation-1/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.customval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java
index 66a2ed7..38863d4 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.customval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java
index f8b4fce..96940bd 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.customval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java
index 1229443..b155b5b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/custom-validation/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.customval.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java
index 6f007d0..1e9aa4c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.datasource40.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
index 776ccf1..c6dbe6d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.datasource40.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java
index fc13c03..606f4e8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/datasource40/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.datasource40.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java
index 32b2dd7..ac28659 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 import java.util.Set;
 

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
index f559683..0e6f501 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.Connection;
 import java.sql.Statement;

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java
index 402f66a..15ebcb1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.markconnectionasbad.xa/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java
index de2650b..939b866 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
index e70743b..d70b434 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java
index 857b879..8866ab5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test1/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java
index 04fc093..949183b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
index 654dc82..c9d3d0a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java
index 857b879..8866ab5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf.notxconn/test2/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcfnotxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java
index 2871750..c72d2ad 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java
index 4b1c1b8..8f4cba2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession2 extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
index a32defb..fc8fba0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Bean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java
index c7125e7..3c5140a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSession2Home.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession2Home extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java
index 793e762..7dbae30 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionBean.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import javax.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import java.util.Set;
 import java.util.HashSet;

appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java
index b2c8b38..92573ab 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/dmmcf/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.dmmcf.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java
index c564a05..ad006c0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.fetchoutofseq.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
index e8a5bec..c7f97de 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.fetchoutofseq.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java
index fa5073a..6c9e2fe 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/fetchoutofseq/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.fetchoutofseq.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java
index 2bd3241..6f33505 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.flushconnectionpool.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
index 352c4be..00b6470 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.flushconnectionpool.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import java.util.Map;

appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java
index 42613f3..923c7c5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/flushconnectionpool/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.flushconnectionpool.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java
index 7d18d55..2e3c305 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.initsql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
index 2daf55f..0325651 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.initsql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java
index 03959a2..410b9aa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/init-sql/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.initsql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java
index 382600d..4df6e35 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc41.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
index b1af4f7..91f0b22 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc41.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java
index 52802db..5b59f03 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/basic/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc41.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java
index 9f0958c..5ceba55 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
index 52e868a..7445272 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbc41-devtests/closeoncompletion.stmtcaching/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
index 3f45def..5e1de7c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuth.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface JmsAuth extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
index e87a87c..03cd8f4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.CreateException;
 import jakarta.jms.QueueConnectionFactory;
 import jakarta.jms.QueueConnection;
 import jakarta.jms.QueueSession;

appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java
index 0a30eaa..9e6be29 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/JmsAuthHome.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface JmsAuthHome extends EJBHome {
     public JmsAuth create() throws CreateException, RemoteException;

appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
index 628e95e..82e4ac1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
index d810e53..d1cf55c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java
index 7815ed9..b258729 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jdbcjmsauth/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.jdbcjmsauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
index 7874966..b1ac27a 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/client/Client.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.util.*;
 import java.sql.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.transaction.UserTransaction;
 import jakarta.annotation.*;
 import jakarta.annotation.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java
index 4c970be..06e0dc5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/Sful.java
@@ -18,7 +18,7 @@
 
 import java.util.Map;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sful {

appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
index fbeb5e8..7702526 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulBean.java
@@ -21,8 +21,8 @@
 
 import javax.naming.InitialContext;
 
-import javax.ejb.Stateful;
-import javax.ejb.EJB;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.EJB;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
@@ -30,9 +30,9 @@
 
 import javax.persistence.EntityManager;
 
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.EJBException;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
+import jakarta.ejb.EJBException;
 
 @DataSourceDefinition(name = "java:app/jdbc/xa",
                         className = "org.apache.derby.jdbc.ClientXADataSource",

appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
index 03e7f74..de756e7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegate.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 import javax.persistence.EntityManager;
 

appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
index f06f15c..714510f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/jpa-dsd/ejb/SfulDelegateBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.ejb.ejb30.persistence.tx_propagation;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.persistence.PersistenceContextType;
 import javax.persistence.PersistenceContext;
 import javax.persistence.EntityNotFoundException;
 
 import javax.persistence.EntityManager;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @Stateful
 public class SfulDelegateBean

appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java
index ebb4fb1..bd5737f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.lazyassoc.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
index 51c409f..58ac355 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.lazyassoc.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java
index 5f47ed4..40f39ac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/lazyassoc/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.lazyassoc.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
index 21e4927..5f72871 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.local.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 import java.sql.Connection;
 

appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
index b5dc135..8619ce3 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.local.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java
index 7e41175..0ecef35 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.local/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.local.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java
index 1557bfa..491fb94 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java
index e09173a..2c90245 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.Connection;
 import java.sql.Statement;

appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java
index 402f66a..15ebcb1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/markconnectionasbad.xa/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.markconnectionasbad.xa.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java
index f1f5385..a73bc8c 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java
index 1e8ad4e..04da364 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java
index 76cbff1..3e8f4e1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/maxconnectionusage/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java
index 999bd46..f059d00 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.multiplecloseconnection.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java
index 23491a2..f2e94c0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1asdev.jdbc.multiplecloseconnection.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java
index be59bc4..85997fa 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multiplecloseconnection/ejb/SimpleSessionHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.jdbc.multiplecloseconnection.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
 
 public interface SimpleSessionHome extends EJBHome {

appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java
index 8a2fbc9..988db48 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java
index 7b5d964..4b0c64d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java
index 81c9503..494377f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/multipleusercredentials/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome {

appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java
index cc40566..0eb8aee 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.nopasswdfordb.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
index ac10b84..c73367e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.nopasswdfordb.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java
index c32518e..6275382 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/nopasswdfordb/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.nopasswdfordb.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java
index ce5abee..891527c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.notxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
index 1c0f1c6..99f6fcc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java
index 898ea1a..31953e3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test1/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.notxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java
index db2a3f6..7be912e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.notxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
index ec81083..0f15ddc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java
index 898ea1a..31953e3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxconn/test2/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.notxconn.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java
index 647652f..17289cd 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.notxops.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
index 8eab4a4..afbd45b 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.notxops.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java
index 14c9c78..dbf7010 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/notxops/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.notxops.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java
index b7205a5..ae2ad4c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTest.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.onlygetconnection.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 import java.util.*;

appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
index de19db0..46551cb 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;
@@ -28,11 +28,11 @@
 public class NoTxConnTestBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 	
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java
index 5ed2c63..a605352 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/onlygetconnection/ejb/NoTxConnTestHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.onlygetconnection.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java
index 07044d5..69219ed 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.pooling.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 import javax.sql.DataSource;
 

appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
index 3258158..3304046 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.pooling.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java
index b4a486d..5dbf6ac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/pooling/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.pooling.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
index 320cb68..e2a768d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.maxpoolsize.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
index 1a52b1f..2049315 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.maxpoolsize.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java
index 17c26a5..ee75523 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/maxpoolsize/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.maxpoolsize.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java
index 568f93f..a0dea46 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
index 45a937f..67cd654 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java
index ec3238f..41c570d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth-2/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java
index 568f93f..a0dea46 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
index f7baa9b..782bdc4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java
index ec3238f..41c570d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/poolauth/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.poolauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java
index fec79aa..2ddd427 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.userpass.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
index a082039..3a64bea 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.userpass.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java
index d478f8e..569c514 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/reconfig/userpass/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.reconfig.userpass.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java
index 3500734..0b7bccf 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
index 1b322e3..0222cd7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java
index a075cb9..634909c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simple/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simple.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java
index bb2a2a0..8bda3bf 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simplemysql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
index 6b0359b..2556bf7 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simplemysql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java
index 265ae56..64e0a45 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simplemysql/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simplemysql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java
index e300d14..adb9144 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simpleora.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
index 72614ec..fd2dd44 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simpleora.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java
index 6aff595..ddb1ce4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleora/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simpleora.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java
index e300d14..adb9144 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simpleora.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
index 1010b27..f20cc0f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simpleora.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java
index 6aff595..ddb1ce4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/simpleoradd/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.simpleora.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java
index 5c170ba..6ea9221 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
index f575d4a..2d0cf8b 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/sqltracemonitoring/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java
index 7919752..cc676be 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
index 43ce57e..74aa810 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementleakdetection/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java
index a9eccc3..d49d3f0 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementtimeout.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java
index 2868be1..7d49f8d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementtimeout.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java
index fd2bf94..b069dd1 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementtimeout/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementtimeout.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java
index 03bfe7c..5b2448a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
index 3c2373f..97aead0 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java
index 90b8139..80ac959 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/statementwrapper/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementwrapper.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java
index 2022090..42104b5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
index ddb028a..bcf3676 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.fixed/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java
index 2022090..42104b5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
index 94b480e..f81bde8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss.monitoring/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java
index 2022090..42104b5 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
index fbc47c3..49a798f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java
index ce6dd96..44de1ce 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stmtCaching_hit_miss/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stmtcaching.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java
index 56f8a21..857909d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stress.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
index 991da0e..a8d570c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stress.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java
index 4c60b31..a346b7e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.stress.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml
index 17b7716..082b7fe 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-roster.xml
@@ -209,7 +209,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -310,7 +310,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml
index 0bc35a8..72e77ad 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/descriptor/ejb-jar-team.xml
@@ -332,7 +332,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>
@@ -517,7 +517,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -612,7 +612,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
index 10b1265..4195b64 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LeagueBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1asdev.jdbc.stress1.util.Debug;
 

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java
index e42b9cd..1b07de6 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeague.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
     public String getLeagueId();

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
index 74c7058..6dc99ca 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java
index 1f98876..c21c7ee 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayer.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
     public String getPlayerId();

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
index 65f015c..2b3ae76 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java
index 0f96401..229ced4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeam.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
     public String getTeamId();

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
index 89e50e1..d0f2fa8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/LocalTeamHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeamHome extends EJBLocalHome {
     public LocalTeam create (String id, String name, String city)

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
index 5997b4e..694bd60 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/PlayerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1asdev.jdbc.stress1.util.Debug;
 

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
index 071ddec..274047f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/Roster.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import com.sun.s1asdev.jdbc.stress1.util.*;
 

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
index e6e5965..592a6b5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterBean.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1asdev.jdbc.stress1.util.*;
 

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java
index f43614a..3db66e0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/RosterHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface RosterHome extends EJBHome {
     Roster create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
index 2561d86..e4562b3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/stress1/ejb/TeamBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.jdbc.stress1.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1asdev.jdbc.stress1.util.Debug;
 import com.sun.s1asdev.jdbc.stress1.util.PlayerDetails;

appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java
index 8f1fa51..a078fcc 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.tracingsql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
index 95b1a71..040881f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.tracingsql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java
index 0b895e5..20d8d48 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/tracingsql/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.tracingsql.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java
index d9c70a2..539a427 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transactions.test1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 import java.util.*;

appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java
index 5c4e56f..c8dd319 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample3home.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transactions.test1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java
index 2821c8b..d25e473 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transactions.test1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java
index 12152f3..31ee623 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsample4home.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transactions.test1.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
index 104fce9..b2d9ed5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean3.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;
@@ -28,9 +28,9 @@
 
 public class bmsamplebean3 implements SessionBean 
 {
-        private transient javax.ejb.SessionContext m_ctx = null;
+        private transient jakarta.ejb.SessionContext m_ctx = null;
 	EJBContext ejbcontext;
-    public void setSessionContext(javax.ejb.SessionContext ctx)
+    public void setSessionContext(jakarta.ejb.SessionContext ctx)
     {
         m_ctx = ctx;
        // m_ctx.setRollbackOnly();

appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
index a6e25d1..41c2463 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/ejb/bmsamplebean4.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;
@@ -28,8 +28,8 @@
 public class bmsamplebean4 implements SessionBean 
 {
 	EJBContext ejbcontext;
-        private transient javax.ejb.SessionContext m_ctx = null;
-    public void setSessionContext(javax.ejb.SessionContext ctx)
+        private transient jakarta.ejb.SessionContext m_ctx = null;
+    public void setSessionContext(jakarta.ejb.SessionContext ctx)
     {
         m_ctx = ctx;
     }

appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
index b94487f..78835ac 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1.java
@@ -19,7 +19,7 @@
 
 
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 import java.util.*;

appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java
index 3fe9fa6..e080ca1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsample1home.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transactions.test2.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
index 636e822..1f67dbc 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/ejb/bmsamplebean1.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;
@@ -34,7 +34,7 @@
 transient    ResultSet rs = null,rs2=null;
 	
 
-    public void setSessionContext(javax.ejb.SessionContext ctx)
+    public void setSessionContext(jakarta.ejb.SessionContext ctx)
     {
         m_ctx = ctx;
     }
@@ -169,7 +169,7 @@
         return 0;
     }
 
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
 }
 
 

appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java
index 3e0c320..323b77f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java
index 40fa72c..df09b86 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java
index 80db325..600d37d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig-resources-xml/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java
index 3e0c320..323b77f 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java
index 7b09e24..8e8f346 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java
index 80db325..600d37d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/transparent-pool-reconfig/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.transparent_pool_reconfig.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
index fa5331e..d39cd75 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/Enroller.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Enroller extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
index ad3b8a9..bb72d3e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import javax.sql.*;
 import javax.transaction.*;

appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java
index 45ce224..2a6b49d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txStress/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface EnrollerHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java
index 9b4a40b..6a6edb5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txafternontx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
index bdb60aa..acbd1be 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txafternontx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java
index 846d291..1eef98e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontx/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txafternontx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java
index 9b4a40b..6a6edb5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txafternontx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
index d5ff502..c1d7f18 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txafternontx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java
index 846d291..1eef98e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txafternontxjndi/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txafternontx.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
index acfab70..6a3dfed 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txisolation.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP  extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
index fa64be9..6991e2a 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txisolation.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java
index 87e9cf5..cf692ca 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txisolation/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txisolation.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java
index 94e9aca..144da83 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txlevelswitch.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBObject {

appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
index 5f32cee..c42c085 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txlevelswitch.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java
index e1627c0..ad94cf5 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txlevelswitch/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txlevelswitch.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBHome

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java
index 4d8bd9d..f9951f2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTest.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txpassthrough.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 import java.util.*;

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
index a59eec0..bc9f8a3 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;
@@ -28,11 +28,11 @@
 public class NoTxConnTestBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 	
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java
index 45101ec..e9a4642 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/NoTxConnTestHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txpassthrough.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java
index 230e572..2591ca8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Second.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txpassthrough.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 import java.util.*;

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
index 5774d53..383e3f2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;
@@ -28,11 +28,11 @@
 public class SecondBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 	
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java
index 18399e2..a30abc2 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/SecondHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txpassthrough.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java
index 8f06cbd..ffbe99d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/Third.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txpassthrough.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 import java.util.*;

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
index 2779330..6678aee 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdBean.java
@@ -19,7 +19,7 @@
 import java.util.*;
 import java.io.*;
 import java.rmi.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 import javax.naming.*;
 import javax.sql.*;
@@ -28,11 +28,11 @@
 public class ThirdBean implements SessionBean {
 
     private EJBContext ejbcontext;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
     transient javax.sql.DataSource ds;
 	
 
-    public void setSessionContext(javax.ejb.SessionContext ctx) {
+    public void setSessionContext(jakarta.ejb.SessionContext ctx) {
         m_ctx = ctx;
     }
 

appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java
index 307b95f..78813f0 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/txpassthrough/ejb/ThirdHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.txpassthrough.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.util.*;
 import java.io.*;

appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java
index 79974d2..ec3bd89 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.autocommit.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
index 4d6fa2b..50f1766 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.autocommit.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java
index f02d309..0ba02f8 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.autocommit.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
index d5ad389..05fd9b4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/autocommit/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java
index bc8339e..ceb2d95 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
index 94fb0c6..cd1d898 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java
index b60c412..28d7340 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectioncreationretry.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
index cffa70f..d210d1c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/conncreationretry/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java
index 5d1690f..241fa57 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface SimpleBMP extends EJBLocalObject {
     public boolean test1();

appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
index 3bd8e60..98a69ed 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;
@@ -25,7 +25,7 @@
         implements SessionBean {
 
     protected DataSource ds;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
 
     public void setSessionContext(SessionContext context) {
 	m_ctx = context;

appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java
index deca6f5..87c4a1e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/ejb/SimpleBMPHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.jdbc.connectionleaktracing.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface SimpleBMPHome
         extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
index f0d29ce..46c545c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/connleaktracing/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java
index 6bc5947..6d48b99 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
index 91da4b5..5ceec41 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.contauth.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.rmi.*;

appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java
index e4cf82c..8d4fc22 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/ejb/SimpleBMPHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.jdbc.contauth.ejb;
 
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
 
 public interface SimpleBMPHome
     extends EJBLocalHome

appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
index f140896..57e866c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/contauth/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java
index d389048..0074689 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java
index 1e8ad4e..04da364 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java
index 5aa79a4..e413ca8 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.maxconnectionusage.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
index 4f1773d..1b1700c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/maxconnectionusage/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java
index 9fb5d4a..33f3b4e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSession extends EJBLocalObject {

appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java
index 7b5d964..4b0c64d 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java
index 9a06ad2..83e8bbe 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/ejb/SimpleSessionHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.multipleusercredentials.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleSessionHome extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
index 0daf999..214bea4 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/multipleusercredentials/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java
index d8817b5..4626204 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.resenabledisable.ejb;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
 public interface SimpleBMP extends EJBLocalObject {
     public boolean test1();

appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
index 9628af4..90a86a1 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.resenabledisable.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;
@@ -25,7 +25,7 @@
         implements SessionBean {
 
     protected DataSource ds;
-    private transient javax.ejb.SessionContext m_ctx = null;
+    private transient jakarta.ejb.SessionContext m_ctx = null;
 
     public void setSessionContext(SessionContext context) {
 	m_ctx = context;

appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java
index 268615c..eb9c524 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/ejb/SimpleBMPHome.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.jdbc.resenabledisable.ejb;
 
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface SimpleBMPHome
         extends EJBLocalHome {

appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
index 9ca9a1a..b5cd08e 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/resEnableDisable/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java
index 028e5fa..f83caf9 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementtimeout.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java
index 2868be1..7d49f8d 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementtimeout.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java
index 1448531..3750b14 100755
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.statementtimeout.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
index a2748a4..cb47f6c 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/v3/statementtimeout/servlet/SimpleServlet.java
@@ -22,7 +22,7 @@
 import javax.servlet.ServletException;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.io.IOException;
 import java.io.PrintWriter;
 

appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java
index 8acc0f4..4292af9 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMP.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.validateatmostonceperiod.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMP

appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
index 93d9a7c..61bea23 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPBean.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.validateatmostonceperiod.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.*;
 import java.sql.*;

appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java

diff --git a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java
index 7800be3..c104b13 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java
+++ b/appserver/tests/appserv-tests/devtests/jdbc/validateatmostonceperiod/ejb/SimpleBMPHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.jdbc.validateatmostonceperiod.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface SimpleBMPHome

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.jmsxdeliverycount.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
index 8acbf1b..0da9a68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB1/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.jmsxdeliverycount.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
index 842fcc9..46840bf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB2/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.jmsxdeliverycount.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
index 8a79cbd..543351e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB3/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
index 0bbf5d7..dd18b9a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
index 2c010c8..1574956 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.jmsxdeliverycount.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
index 5e575d8..38980d3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/MDB4/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
index 219de1c..b6a0d70 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
index fd97854..f1b9e4b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean1/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.jmsxdeliverycount.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
index b84c162..50ca44f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
index fd97854..f1b9e4b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/JMSXDeliveryCount/sessionBean2/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.jmsxdeliverycount.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
index e86b8c1..f553fec 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 112a18a..e58da8c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 722d305..c66f2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index 1f9f2e8..a138753 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 03a4788..64a92af 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 7fc9359..391abe2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 3b65805..ed70d1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index c4bf6f7..bb9505d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
index 4dfc257..09bde12 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 9d32ad1..d8c28e8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index 87da4b7..40dbf02 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 4a21e37..971389a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 8ac3cbf..8013738 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index 8f0028d..72bb270 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index c8fc332..65c4c48 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 9d3c0a2..8e8c255 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 4a21e37..971389a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 0f94329..1a89053 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 021595e..9ae2684 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index 2292af6..aad4174 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
index a20c857..d40359f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
index be5c1cf..c960afa 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
index 671a6bb..80bb9b8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
index 3abb9ea..b236b38 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableNotSharedWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
index bc5a7e1..813fa1b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
index bfcae12..50db2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index bf8c238..e0ac9b0 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/cluster/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
index e495e25..6e21123 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 4c0bc78..775ef68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 9945ad5..8bc9109 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index a8d0b11..9e6d769 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 @MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 5372658..b466943 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 6cad007..9ba7b08 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 2afdfd5..198c748 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index a67a914..3a2f313 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 5656498..7985e1f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index cb46c2e..af50fb1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 443b85b..a7a9dbe 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index c7e7720..df0e0bb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 9d03bde..5b1c990 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 5ec8ddc..2eabe0d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 83567df..3e8f1d3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 5d24980..9baa358 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index 8806c03..cad5fdf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
index f973621..327a0e9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
index 9885aff..e368a51 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
index bfcae12..50db2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 073bb1e..3e7db94 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/embedded/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
index e495e25..6e21123 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
index 4c0bc78..775ef68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
index 9945ad5..8bc9109 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
index 4c2ca4f..de638e2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
index 5372658..b466943 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
index 6cad007..9ba7b08 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
index 649a50f..bf77e60 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 @MessageDriven(mappedName = "jms/jms_unit_test_Topic", activationConfig = {

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
index a67a914..3a2f313 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/ClusterScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
index 5656498..7985e1f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
index cb46c2e..af50fb1 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
index 443b85b..a7a9dbe 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
index c7e7720..df0e0bb 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/durableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
index 9d03bde..5b1c990 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
index 605b4fa..cae9cb8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
index 431282a..11b9816 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
index 83567df..3e8f1d3 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
index 5d24980..9baa358 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/InstanceScope/nondurableWithoutName/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
index 8806c03..cad5fdf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableNoClientIdWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
index f973621..327a0e9 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/durableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
index b9bc63c..b21c9bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
index 9885aff..e368a51 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
index bfcae12..50db2f6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
index 74dac54..cfad38a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.activationproperties.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
index 073bb1e..3e7db94 100644
--- a/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/activationProperties/subscriptionScope/standalone/local/noScope/nondurableWithoutName/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
index 24a70c4..e5ab766 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MyMessageBean.java
@@ -19,9 +19,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDriven;
 import javax.inject.Inject;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSConnectionFactory;

appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
index 3b33cd4..b6175b2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBean.java
@@ -18,8 +18,8 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;

appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java
index 218b0f4..7be3c68 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB1/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.annotation.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface MySessionBeanRemote {

appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
index 1a762ee..a013f86 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MyMessageBean.java
@@ -19,9 +19,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDriven;
 import javax.inject.Inject;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;

appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
index 050419d..abe5c3d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBean.java
@@ -18,8 +18,8 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;

appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java
index 5da93ae..7f15f44 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB2/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.annotation.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface MySessionBeanRemote {

appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
index e6919cf..364700f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MyMessageBean.java
@@ -19,9 +19,9 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJBException;
-import javax.ejb.MessageDriven;
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.MessageDriven;
 import javax.inject.Inject;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSConnectionFactory;

appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
index 015be15..5f7a6f8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBean.java
@@ -18,8 +18,8 @@
 
 import java.util.logging.Logger;
 import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;

appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java
index 5da93ae..7f15f44 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/MDB3/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.annotation.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface MySessionBeanRemote {

appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java
index 0ce3f65..c521898 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBean.java
@@ -17,8 +17,8 @@
 package org.glassfish.test.jms.annotation.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.Stateless;
 import jakarta.jms.Connection;
 import jakarta.jms.ConnectionFactory;
 import jakarta.jms.JMSConnectionFactoryDefinition;

appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java
index 5da93ae..7f15f44 100644
--- a/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/annotation/sessionBean/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.annotation.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface MySessionBeanRemote {

appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
index 3068c91..ecd76da 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefault.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.defaultcf.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
index 6ebf2eb..e0af5bd 100644
--- a/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/defaultCF/ejb/SessionBeanDefaultRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.defaultcf.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
index c9d1188..5eda27a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjection.java
@@ -19,7 +19,7 @@
 import jakarta.annotation.Resource;
 import javax.inject.Inject;
 import javax.interceptor.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 /**

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
index c9c3134..f91ce7e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/InterceptorInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
index a04ac83..e9124d4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorRequestScoped/ejb/MyInterceptor.java
@@ -21,7 +21,7 @@
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 public class MyInterceptor {

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
index 4a9262b..85bac6d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjection.java
@@ -19,7 +19,7 @@
 import jakarta.annotation.Resource;
 import javax.inject.Inject;
 import javax.interceptor.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 /**

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
index c9c3134..f91ce7e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/InterceptorInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
index f2d1bf5..aaa69cf 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/ejbInterceptorTransactionScoped/ejb/MyInterceptor.java
@@ -20,7 +20,7 @@
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 public class MyInterceptor {

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
index ffc0d38..a3a7515 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jsfTransactionScoped/servlet/com/oracle/jms/test/NewJSFManagedBean.java
@@ -25,7 +25,7 @@
 import jakarta.faces.bean.ViewScoped;
 import javax.inject.Inject;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.UserTransaction;
 
 /**

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/jspTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
index 8624092..67f6d41 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
index 64f8dec..37722f5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
index 8624092..67f6d41 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
index 64f8dec..37722f5 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/servletTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
index e8d62b7..4c6d5c4 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
index 92ff9b9..d7ef45b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanRequestScoped/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
index aaa0e4c..4d86405 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
index 92ff9b9..d7ef45b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/sessionBeanTransactionScoped/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsRequestScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
index 894408f..eda2327 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
index f394e40..2230213 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/basic/wsTransactionScoped/ejb/MessageReceiverRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
index 3882edf..b3aa22f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import java.lang.String;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
index 90fe77d..5dbc33b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
index 1efe2aa..1cb4a4c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextDefaultInjection/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
index bdd9730..4904663 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
index 468549e..285de4c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionA/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
index ebaaa64..efcfaad 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
index 4683c1c..c2ea79c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
index a2673e0..02dc134 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionB/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
index 9e7d7ba..f2f968c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import java.lang.String;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
index 801d461..2bfa214 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionC/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
index a10f02e..6c72089 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
index a7acdf7..accf635 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionD/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
index ebc81b3..66f2fe7 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
index 28c3866..0805e9d 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionE/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
index b038c72..b36f345 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
index 5522985..09a8562 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionF/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
index 90d2f35..851398b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import javax.transaction.UserTransaction;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java
index 7774c3b..5eb887e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionG/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
index 0ca0de8..26d79e6 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjection.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import javax.transaction.UserTransaction;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java
index a41f696..d2f384e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionH/ejb/SessionBeanInjectionRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
index 8f45bd1..293b99a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
index 4bedb92..d0e0362 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java
index 2ff7151..affd7f2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
index df9873b..3de6e9f 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionJ/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
index 7c06e06..31ad25a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection1.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 import org.glassfish.test.jms.injection.ejb.SessionBeanInjection2;

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
index 334fe22..c08d15b 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjection2.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.injection.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
index 1efe2aa..1cb4a4c 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote1.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java
index 4b31ef8..7da2d62 100644
--- a/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/injection/jmsContext/mixedScoped/jmsContextInjectionK/ejb/SessionBeanInjectionRemote2.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.injection.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
index a6c1f3e..062127e 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.test.jms.mdbdest.ejb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
index 1a3967d..bc8af24 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/MySessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.jms.mdbdest.ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
index 8d8b067..65b87ed 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
index 586f309..4daf381 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean1.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
index 725f21e..218783a 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean2.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
index c5bbfa6..5a4a738 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean3.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
index 01c71d9..8e44de2 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean4.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
index db11e96..e9a5cf8 100644
--- a/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
+++ b/appserver/tests/appserv-tests/devtests/jms/mdbDest/ejb/NewMessageBean5.java
@@ -18,7 +18,7 @@
 
 import java.util.logging.*;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
index 25b74b9..a2473be 100644
--- a/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/jms/msgdest/jmsweb/ejb/MessageBean.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.io.Serializable;
 import javax.naming.*;
 

appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java b/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
index 941e139..d6767f8 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/client/Client.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import javax.naming.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java
index 6730967..7604e9d 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Hello {

appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
index ffbec54..a78df94 100644
--- a/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/injection/ejb/HelloBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.net.*;
 import java.util.*;

appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
index d752fe5..97de523 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
index 3647c2a..8023bb6 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
index c9897b5..2ae3de5 100755
--- a/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/loadbalancing/enroller/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
index 8c8d171..d2a4674 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Course.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
index 1474049..c0ff8c4 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
index 11b68d5..a969a3b 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/CourseHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
 
 public interface CourseHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
index 3d3aec8..1ed88fd 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Enroller.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Enroller extends EJBObject {

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
index 053d361..ce9877f 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java
index 45ce224..2a6b49d 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface EnrollerHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
index 890c3de..6a8bd29 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
index 3447daf..04d951e 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
index c9897b5..2ae3de5 100755
--- a/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
+++ b/appserver/tests/appserv-tests/devtests/naming/lookup/enroller/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml

diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
index 8ee07d4..dd120e6 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/pom.xml
@@ -38,7 +38,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
-            <artifactId>javax.ejb</artifactId>
+            <artifactId>jakarta.ejb</artifactId>
             <version>3.1.1</version>
             <scope>compile</scope>
         </dependency>

appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
index 825d466..c3df817 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/main/java/test/TestBean.java
@@ -17,7 +17,7 @@
 package test;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.Properties;
 

appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java

diff --git a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
index f9c3159..4c855e2 100644
--- a/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
+++ b/appserver/tests/appserv-tests/devtests/naming/naming2/context/src/test/java/test/ContextTest.java
@@ -26,7 +26,7 @@
 import org.junit.rules.TestName;
 import org.junit.rules.TestWatcher;
 
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Binding;
 import javax.naming.Context;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java

diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
index de0979c..fbb21b3 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/client/AppClient.java
@@ -16,7 +16,7 @@
 
 package client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import java.util.Collection;
 import java.util.List;

appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java

diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java
index 9cbfceb..208306c 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/Test.java
@@ -16,7 +16,7 @@
 
 package ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 import entity.Customer;
 

appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
index 7182a0f..a23e512 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEarLibTest/ejb/TestBean.java
@@ -16,8 +16,8 @@
 
 package ejb;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;

appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java

diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
index de0979c..fbb21b3 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/client/AppClient.java
@@ -16,7 +16,7 @@
 
 package client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import java.util.Collection;
 import java.util.List;

appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java

diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java
index 9cbfceb..208306c 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/Test.java
@@ -16,7 +16,7 @@
 
 package ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 import entity.Customer;
 

appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
index 7182a0f..a23e512 100755
--- a/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/persistence/tests/packaging/pkgEjbTest/ejb/TestBean.java
@@ -16,8 +16,8 @@
 
 package ejb;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;

appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java b/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
index 30b41d5..945a8d2 100644
--- a/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/anyone/client/Client.java
@@ -21,7 +21,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.Socket;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java
index 8bfbc00..c885758 100644
--- a/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/anyone/ejb/HelloEjb.java
@@ -19,9 +19,9 @@
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.DeclareRoles;
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Remote({Hello.class})

appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
index 1537c52..6a82460 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
 package com.sun.devtest.security.plogin.converter.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import java.math.*;
 
 /**

appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
index 64d1062..bc31d75 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.devtest.security.plogin.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java
index 681994f..5a3e317 100644
--- a/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/cplogin/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java
index 5d2b4cd..b4c1aae 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/AppResource.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.test.authpropagation;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.http.HttpServletRequest;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.POST;

appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
index 4a0d598..25b9968 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/DataSourceInitializer.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.*;
 import jakarta.annotation.sql.DataSourceDefinition;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java
index ea60849..a2cefe8 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/SchedulerService.java
@@ -18,7 +18,7 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.logging.Logger;
 
 @Singleton

appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java
index ee66e55..2cafa11 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-auth-async/scheduler-service/src/main/java/org/glassfish/test/auth-propagation/Service.java
@@ -17,10 +17,10 @@
 package org.glassfish.test.authpropagation;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Asynchronous;
-import javax.ejb.LocalBean;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.Asynchronous;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
 import java.util.logging.Logger;
 
 @Stateless

appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
index 9e2a374..24ab044 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import java.math.*;
 
 /**

appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
index ed4894a..aa1e91b 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java
index 9d9a0f2..d27402a 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-mutual-ssl/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
index 9e2a374..24ab044 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import java.math.*;
 
 /**

appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
index ed4894a..aa1e91b 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java
index 9d9a0f2..d27402a 100644
--- a/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/ejb-oneway-ssl/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
index d5dc4c8..c36560b 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloEJB.java
@@ -19,8 +19,8 @@
 import java.security.Principal;
 
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class HelloEJB implements Hello {

appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
index ac2ed3d..79524c3 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/ejb/HelloStatefulEJB.java
@@ -23,8 +23,8 @@
 import jakarta.annotation.security.DeclareRoles;
 import jakarta.annotation.security.RolesAllowed;
 
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateful;
 
 @DeclareRoles({"javaUsers"})
 

appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java b/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
index 96cd75d..1f83573 100644
--- a/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/jaccmr8/web/Servlet.java
@@ -20,8 +20,8 @@
 import javax.servlet.*;
 import javax.servlet.http.*;
 import javax.naming.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBs;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBs;
 import java.net.URLEncoder;
 import java.net.URLDecoder;
 import java.security.Principal;

appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
index 14296fd..48a46b6 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soap/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.jmac.soap.ejbws;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jws.WebService;
 
 @Stateless

appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
index ec8c068..be708d7 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapDefault/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.jmac.soapdefault.ejbws;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jws.WebService;
 
 @Stateless

appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
index f2b925b..f0b9527 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/soapEmbedded/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.jmac.soapembedded.ejbws;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jws.WebService;
 
 @Stateless

appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
index 1c3ac18..b2b3e0a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoBean.java
@@ -16,12 +16,12 @@
 
 package profile;
 
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
 import java.util.Vector;
 import java.lang.String;
 import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException;
 /**
  *
@@ -62,7 +62,7 @@
     }
     
     
-    public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
         sc = sessionContext;
     }
     

appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
index 568ed0c..f47ad2a 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoHome.java
@@ -16,7 +16,7 @@
 
 package profile;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 /**
  *
  * @author  swchan2
@@ -24,6 +24,6 @@
 public interface ProfileInfoHome extends EJBHome{
     
     public ProfileInfoRemote create(String name) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java
index 31683e4..1ba4359 100644
--- a/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/jsp2sful/profile/ProfileInfoRemote.java
@@ -17,7 +17,7 @@
 package profile;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 
 /**
  * ProfileInfo Stateful Session Bean. Test JSR 115 authorization.

appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
index 9aac322..d6462de 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaBean.java
@@ -22,9 +22,9 @@
 
 package shopping;
 
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 import java.util.List;
@@ -107,7 +107,7 @@
     }
     
     
-    public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
         sc = sessionContext;
     }
 

appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
index 73cf369..3da5d67 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaHome.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 /**
  *
  * @author  Harpreet Singh
@@ -29,6 +29,6 @@
 public interface RpaHome extends EJBHome{
     
     public RpaRemote create(java.lang.String shopperName) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/ldapRealmPerApp/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 /**
  * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name 
  *  -Dj2eelogin.password system properties.

appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
index a23ead3..bd90c33 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import jakarta.jms.*;
 import jakarta.annotation.Resource;
 

appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java

diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
index 6d94f42..58ae398 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateful.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.security.RolesAllowed;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
 
 // Hello1 interface is not annotated with @Local. If the

appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java

diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
index 7e1c5ce..7740e37 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/HelloStateless.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.security.mdb;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 // Hello1 interface is not annotated with @Local. If the
 // bean only implements one interface it is assumed to be

appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
index d1997c8..67eb919 100644
--- a/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/mdb/ejb/MessageBean.java
@@ -16,14 +16,14 @@
 
 package com.sun.s1asdev.security.mdb;
 
-import javax.ejb.AccessLocalException;
-import javax.ejb.MessageDriven;
-import javax.ejb.EJBException;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.ejb.ActivationConfigProperty;
+import jakarta.ejb.AccessLocalException;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
+import jakarta.ejb.ActivationConfigProperty;
 
 import jakarta.jms.MessageListener;
 import jakarta.jms.Message;

appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java

diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
index d375f6e..b4c56d6 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageBean1.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb1;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Local({MessageLocal1.class})

appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java

diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
index d885246..1d6ceff 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb1/MessageLocal1.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb1;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 /**
  * This is the business interface for Message enterprise bean.

appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
index cb7a3d0..a4352a8 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageBean2.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb2;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Local({MessageLocal2.class})

appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java

diff --git a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
index 4a2c5f4..0202395 100644
--- a/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
+++ b/appserver/tests/appserv-tests/devtests/security/multiRoleMapping/ejb2/MessageLocal2.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb2;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 /**
  * This is the business interface for Message enterprise bean.

appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java

diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
index 3e2dca5..a5d6796 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/client/NegativeRPAClient.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
index d126ae5..804ca35 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPABean.java
@@ -25,9 +25,9 @@
 import java.rmi.RemoteException;
 import java.util.Iterator;
 import java.util.Vector;
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 /**
  *

appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
index aaa89cc..303f89b 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPAHome.java
@@ -20,7 +20,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import shopping.NegativeRPARemote;
 /**
  *
@@ -30,6 +30,6 @@
 public interface NegativeRPAHome extends EJBHome{
     
     public NegativeRPARemote create(java.lang.String shopperName) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
index c65f0fe..7afd1d7 100644
--- a/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/negativeRealmPerApp/shopping/NegativeRPARemote.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 /**
  * Negative RealmPerAPP Stateful Session Bean. 
  * Tries to log into a non existent realm

appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
index b614211..556cacd 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Bean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * This is the bean class for the MySession1Bean enterprise bean.
@@ -23,28 +23,28 @@
     private SessionContext context;
     
     /**
-     * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext)
+     * @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
      */
     public void setSessionContext(SessionContext aContext) {
         context = aContext;
     }
     
     /**
-     * @see javax.ejb.SessionBean#ejbActivate()
+     * @see jakarta.ejb.SessionBean#ejbActivate()
      */
     public void ejbActivate() {
         
     }
     
     /**
-     * @see javax.ejb.SessionBean#ejbPassivate()
+     * @see jakarta.ejb.SessionBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
     }
     
     /**
-     * @see javax.ejb.SessionBean#ejbRemove()
+     * @see jakarta.ejb.SessionBean#ejbRemove()
      */
     public void ejbRemove() {
         

appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
index 57f82ec..798d406 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1Remote.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 
 
 /**

appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
index daada77..7ebc8f0 100644
--- a/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/plogin/standalone/ejb/MySession1RemoteHome.java
@@ -15,8 +15,8 @@
  */
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 
 /**

appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java

diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
index ce7a95d..43d0772 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/client/RpaClient.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
index fc2064f..c73946d 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaBean.java
@@ -22,12 +22,12 @@
 
 package shopping;
 
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
 import java.util.Vector;
 import java.lang.String;
 import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException;
 /**
  *
@@ -114,7 +114,7 @@
     }
     
     
-    public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
         sc = sessionContext;
     }
     

appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
index e52095e..d4262d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaHome.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import shopping.RpaRemote;
 /**
  *
@@ -30,6 +30,6 @@
 public interface RpaHome extends EJBHome{
     
     public RpaRemote create(java.lang.String shopperName) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/realmPerApp/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 /**
  * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name 
  *  -Dj2eelogin.password system properties.

appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
index 51ae847..a0c2e43 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.sameEjbName.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
index 7e4da18..a47e4fc 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb/HelloEjb.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.sameEjbName.ejb;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Remote({Hello.class})

appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
index 62818cd..5a5c42e 100644
--- a/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/sameEjbName/ejb2/HelloEjb.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.sameEjbName.ejb2;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Remote({Hello.class})

appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java

diff --git a/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java b/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
index 6576ac1..8ab18d4 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/client/ShoppingCartClient.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
index d7d63b6..215d324 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartBean.java
@@ -22,12 +22,12 @@
 
 package shopping;
 
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
 import java.util.Vector;
 import java.lang.String;
 import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException;
 /**
  *
@@ -119,7 +119,7 @@
     }
     
     
-    public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
         sc = sessionContext;
     }
     

appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
index 90baa62..9d44c82 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartHome.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import shopping.ShoppingCartRemote;
 /**
  *
@@ -30,6 +30,6 @@
 public interface ShoppingCartHome extends EJBHome{
     
     public ShoppingCartRemote create(java.lang.String shopperName) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
index 98f39c5..bb324d1 100644
--- a/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/sful/shopping/ShoppingCartRemote.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 /**
  * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name 
  *  -Dj2eelogin.password system properties.

appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
index 3435f84..02783e4 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import java.math.*;
 
 /**

appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
index 65a717d..30be995 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java
index 57b5a98..bf2a631 100644
--- a/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/simple-perf/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
index 6af8c8e..2cb9766 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageBean.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Local({MessageLocal.class})

appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
index 2823923..b8546a1 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/ejb/MessageLocal.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.simpleMultiRoleMapping.ejb;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 /**
  * This is the business interface for Message enterprise bean.

appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java

diff --git a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
index 37269f5..3285836 100644
--- a/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/simpleMultiRoleMapping/web/EjbTest.java
@@ -19,7 +19,7 @@
 import com.sun.s1asdev.security.simpleMultiRoleMapping.ejb.MessageLocal;
 import java.io.*;
 import java.net.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 import javax.servlet.*;
 import javax.servlet.http.*;

appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java

diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
index 7d2831b..42bc50d 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/client/RpaClient.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
index cec09e4..405f369 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaBean.java
@@ -22,12 +22,12 @@
 
 package shopping;
 
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
 import java.util.Vector;
 import java.lang.String;
 import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException;
 /**
  *
@@ -115,7 +115,7 @@
     }
     
     
-    public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
         sc = sessionContext;
     }
     

appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
index e52095e..d4262d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaHome.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import shopping.RpaRemote;
 /**
  *
@@ -30,6 +30,6 @@
 public interface RpaHome extends EJBHome{
     
     public RpaRemote create(java.lang.String shopperName) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/solarisRealm/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 /**
  * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name 
  *  -Dj2eelogin.password system properties.

appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java

diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
index 91042e9..4868ae2 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/src/main/java/org/glassfish/soteria/test/LdapSetup.java
@@ -24,8 +24,8 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 /**
  * Starts up the embedded Unboundid LDAP server on port 33389 and loads a test directory

appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java

diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
index 4420109..d5b7153 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/java/org/glassfish/soteria/test/DatabaseSetup.java
@@ -24,8 +24,8 @@
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
 import jakarta.annotation.sql.DataSourceDefinition;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 import javax.sql.DataSource;
 
 @Singleton

appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java

diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
index 67f269e..5bb66a0 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/Servlet.java
@@ -19,7 +19,7 @@
 import org.glassfish.soteria.SecurityContextImpl;
 
 import jakarta.annotation.security.DeclareRoles;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.security.enterprise.AuthenticationStatus;
 import javax.security.enterprise.SecurityContext;
 import javax.security.enterprise.credential.CallerOnlyCredential;

appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
index 1895443..9f103dd 100644
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/java/org/glassfish/soteria/test/TestEJB.java
@@ -16,12 +16,12 @@
 
 package org.glassfish.soteria.test;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 import jakarta.annotation.security.DeclareRoles;
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.Resource;
-import javax.ejb.EJBContext;
+import jakarta.ejb.EJBContext;
 import jakarta.annotation.security.RolesAllowed;
 import org.glassfish.soteria.SecurityContextImpl;
 import javax.security.enterprise.SecurityContext;

appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java

diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
index f9cde7f..7381bdf 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/client/LoginContextDriverTest.java
@@ -19,7 +19,7 @@
 
 import java.util.Properties;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
index b614211..556cacd 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Bean.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * This is the bean class for the MySession1Bean enterprise bean.
@@ -23,28 +23,28 @@
     private SessionContext context;
     
     /**
-     * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext)
+     * @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
      */
     public void setSessionContext(SessionContext aContext) {
         context = aContext;
     }
     
     /**
-     * @see javax.ejb.SessionBean#ejbActivate()
+     * @see jakarta.ejb.SessionBean#ejbActivate()
      */
     public void ejbActivate() {
         
     }
     
     /**
-     * @see javax.ejb.SessionBean#ejbPassivate()
+     * @see jakarta.ejb.SessionBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
     }
     
     /**
-     * @see javax.ejb.SessionBean#ejbRemove()
+     * @see jakarta.ejb.SessionBean#ejbRemove()
      */
     public void ejbRemove() {
         

appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
index 57f82ec..798d406 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1Remote.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 
 
 /**

appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
index daada77..7ebc8f0 100644
--- a/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/standalone/loginctxdriver/ejb/MySession1RemoteHome.java
@@ -15,8 +15,8 @@
  */
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 
 /**

appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
index 89f0aa2..b0c3727 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/client/Client.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.timerStandalone.client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.security.timerStandalone.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java
index ac1d846..9245d21 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.security.timerStandalone;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
 
 @Stateful
 @Remote({Sful.class})

appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
index eaf5771..e6b0801 100644
--- a/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/timerStandalone/ejb/SlessEJB.java
@@ -20,12 +20,12 @@
 import jakarta.annotation.security.DeclareRoles;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.Remote;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
+import jakarta.ejb.Remote;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
 
 @Stateless
 @Remote({Sless.class})

appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java

diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
index 1cf5f16..2ffc42a 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/client/RpaClient.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java

diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
index 3489659..4b53bd4 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaBean.java
@@ -22,12 +22,12 @@
 
 package shopping;
 
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
 import java.util.Vector;
 import java.lang.String;
 import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException;
 /**
  *
@@ -114,7 +114,7 @@
     }
     
     
-    public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
         sc = sessionContext;
     }
     

appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java

diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
index e52095e..d4262d0 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaHome.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import shopping.RpaRemote;
 /**
  *
@@ -30,6 +30,6 @@
 public interface RpaHome extends EJBHome{
     
     public RpaRemote create(java.lang.String shopperName) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
index d5b1bb9..fb8a773 100644
--- a/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
+++ b/appserver/tests/appserv-tests/devtests/security/userWithAtSymbol/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
  */
 
 package shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 /**
  * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name 
  *  -Dj2eelogin.password system properties.

appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
index 38a459d..38a896d 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/build.xml
@@ -60,7 +60,7 @@
         <mkdir dir="${build.classes.dir}/client/META-INF/wsdl"/>
         <antcall target="wsgen">
             <param name="wsgen.args"
-                value="-wsdl -cp ${build.classes.dir}/ejbws:${s1astest.classpath}/modules/javax.ejb.jar -keep -d ${build.classes.dir}/ejbws com.sun.s1asdev.security.wss.gartner.PingEjb"/>
+                value="-wsdl -cp ${build.classes.dir}/ejbws:${s1astest.classpath}/modules/jakarta.ejb.jar -keep -d ${build.classes.dir}/ejbws com.sun.s1asdev.security.wss.gartner.PingEjb"/>
         </antcall>
 
         <antcall target="wsgen">

appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java
index f4d8871..5e1de6e 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/gartner/ejbws/PingEjb.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.security.wss.gartner;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @WebService(targetNamespace="http://gartner.wss.security.s1asdev.sun.com")

appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
index 36b006d..99ce593 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/HelloEjb.java
@@ -22,9 +22,9 @@
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceContext;
 

appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java
index d068bec..1c98945 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws/SfulEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.wss.roles.ejb;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
 
 @Stateful
 @Local({SfulLocal.class})

appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
index f5b18eb..ba06231 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles/ejbws2/HelloEjb2.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.security.wss.roles.ejbws2;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jws.WebService;
 
 @Stateless

appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
index 39b984e..c67cc18 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/HelloEjb.java
@@ -22,9 +22,9 @@
 import jakarta.annotation.security.PermitAll;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
 import jakarta.jws.WebService;
 
 import com.sun.s1asdev.security.wss.roles2.ejb.SfulLocal;

appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
index 614e9d0..c13f90b 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SfulEJB.java
@@ -18,9 +18,9 @@
 
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
-import javax.ejb.Local;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateful;
 
 @Stateful
 @Local({SfulLocal.class})

appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java
index 0c46713..debfd65 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/roles2/ejbws/SlessEJB.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.wss.roles2.ejb;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
+import jakarta.ejb.Local;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @Local({SlessLocal.class})

appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java
index dad4f2b..8d14ac3 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/ssl/ejbws/HelloEjb.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.security.wss.ssl.ejbws;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jws.WebService;
 
 @Stateless

appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java
index 485a3ae..838e372 100644
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/ejbws/HelloEjb.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.security.wss.sslclientcert.ejbws;
 
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateless;
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceContext;
 

appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java
index fc7533c..d50f324 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/autorecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java
index 6c6036a..d7ad602 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/TestServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/cli/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java
index fc7533c..d50f324 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/TestServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/base/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
index 22d28b7..e64fa49 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MdBean.java
@@ -21,7 +21,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 /**

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
index 9a29a24..949ac53 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
index 115aaff..1ec9fac 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/TestServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.servlet.ServletConfig;

appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
index d010c36..06e5f2e 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/dblogs/mdb/war/VerifyServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.servlet.ServletConfig;

appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
index 22d28b7..e64fa49 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MdBean.java
@@ -21,7 +21,7 @@
 
 package com.acme;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 /**

appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
index 0736479..d47f6c0 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;

appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
index 66c820a..5addeb8 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/TestServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.servlet.ServletConfig;

appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
index d010c36..06e5f2e 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/mdb/war/VerifyServlet.java
@@ -16,7 +16,7 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.servlet.ServletConfig;

appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java
index ac10596..f95bab7 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
index 85a018a..d46371f 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/resendautorecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java
index fc7533c..d50f324 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 

appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
index bc79260..d5e68a2 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/selfrecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java
index fa82fae..462d545 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/MyBean.java
@@ -22,7 +22,7 @@
 package com.acme;
 
 import java.sql.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.sql.DataSource;
 import javax.naming.InitialContext;
 import jakarta.annotation.Resource;

appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
index 0e8c714..aaa4330 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/TestServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
index 9c530f8..51a5d96 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/ee/timer_with_autorecovery/war/VerifyServlet.java
@@ -16,8 +16,8 @@
 
 package com.acme;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.Connection;

appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
index 6ef8b73..58273c2 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxBeanB.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.SessionSynchronization;
-import javax.ejb.*;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionSynchronization;
+import jakarta.ejb.*;
 
 import java.sql.Statement;
 import java.sql.ResultSet;

appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java
index af3b342..22d1bfa 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteB extends EJBObject{

appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java
index 76b956b..106ebd3 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/twopcreadonly/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeB extends EJBHome {
     public TxRemoteB create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
index 09ba49c..a9f38b2 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/client/Client.java
@@ -60,7 +60,7 @@
             try {
                 result = t.testA1(xa);
 		System.out.println("TEST FAILED");
-            } catch (javax.ejb.CreateException e) {
+            } catch (jakarta.ejb.CreateException e) {
                 System.out.println("CreateException");
 		System.out.println("TEST FAILED");
             } catch (Exception e) {
@@ -77,7 +77,7 @@
             try {
                 result = t.testA1(nonxa);
 		System.out.println("TEST FAILED");
-            } catch (javax.ejb.CreateException e) {
+            } catch (jakarta.ejb.CreateException e) {
                 System.out.println("CreateException");
 		System.out.println("TEST FAILED");
             } catch (Exception e) {

appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
index efac3e6..9fc0273 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestBean.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txhung.ejb.test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 import java.sql.Statement;
 import java.sql.ResultSet;

appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
index 6887fc2..a6a2dcb 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestHome.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txhung.ejb.test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface TestHome extends EJBHome {

appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
index 9bd508c..228c1f4 100644
--- a/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txhung/ejb/test/TestRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txhung.ejb.test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface TestRemote extends EJBObject {

appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
index 1f85144..f4d3366 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxBeanA.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txlao.ejb.beanA;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java
index 8c8da72..5f455b3 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteA.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txlao.ejb.beanA;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteA extends EJBObject{

appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java
index 06cadc8..8d85979 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanA/TxRemoteHomeA.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txlao.ejb.beanA;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeA extends EJBHome {
     public TxRemoteA create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
index 8c00ea2..144447f 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxBeanB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txlao.ejb.beanB;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 import java.sql.Statement;
 import java.sql.ResultSet;

appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java
index ad4543e..01e331d 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txlao.ejb.beanB;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteB extends EJBObject{

appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java
index 77eab64..295ed0d 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txlao/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txlao.ejb.beanB;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeB extends EJBHome {
     public TxRemoteB create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java b/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
index ffb8213..9469fdb 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txnegative/client/Client.java
@@ -67,7 +67,7 @@
             try {
                 result = t.testA1(xa);
 		System.out.println("TEST FAILED");
-            } catch (javax.ejb.CreateException e) {
+            } catch (jakarta.ejb.CreateException e) {
                 System.out.println("CreateException");
 		System.out.println("TEST FAILED");
             } catch (Exception e) {
@@ -83,7 +83,7 @@
             try {
                 result = t.testA1(nonxa);
 		System.out.println("TEST FAILED");
-            } catch (javax.ejb.CreateException e) {
+            } catch (jakarta.ejb.CreateException e) {
                 System.out.println("CreateException");
 		System.out.println("TEST FAILED");
             } catch (Exception e) {

appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java
index b81405d..f3c6416 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxBeanA.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txstress.ejb.beanA;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java
index ca444d5..abcfc44 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteA.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txstress.ejb.beanA;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteA extends EJBObject{

appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java
index 2eafaa8..14eca7c 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanA/TxRemoteHomeA.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txstress.ejb.beanA;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeA extends EJBHome {
     public TxRemoteA create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
index dbdbfba..2fefbf3 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxBeanB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txstress.ejb.beanB;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 import java.sql.Statement;
 import javax.transaction.UserTransaction;

appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java
index 02dd0b8..9f831b8 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txstress.ejb.beanB;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteB extends EJBObject{

appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java
index 4a47990..98aacfa 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstress/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txstress.ejb.beanB;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeB extends EJBHome {
     public TxRemoteB create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java
index ddc8928..5d89baa 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxBeanA.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanA;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java
index 09318dc..d974a3f 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteA.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanA;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteA extends EJBObject{

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java
index a86f169..cb77f25 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanA/TxRemoteHomeA.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanA;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeA extends EJBHome {
     public TxRemoteA create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
index a43e678..5031cb8 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxBeanB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanB;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 import java.sql.Statement;
 import java.sql.ResultSet;

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java
index b9c145a..09795af 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanB;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteB extends EJBObject{

appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java

diff --git a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java
index 2300762..5c0fb4c 100755
--- a/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/appserv-tests/devtests/transaction/txstressreadonly/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txstressreadonly.ejb.beanB;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeB extends EJBHome {
     public TxRemoteB create() throws RemoteException, CreateException;

appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 5f1e9d9..99d3582 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
index 0bdba81..f71a559 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java
@@ -24,9 +24,9 @@
 import java.io.Serializable;
 import java.util.concurrent.atomic.AtomicInteger;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.LocalBean;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Remove;
+import jakarta.ejb.Stateful;
 
 /**
  *

appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
index b9129a1..bc2420f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/TestServlet.java
@@ -17,7 +17,7 @@
 package test;
 
 import java.io.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import javax.servlet.annotation.WebServlet;

appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java
index e54eef6..56fba77 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean.java
@@ -16,8 +16,8 @@
 
 package wftest;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class WFStatelessBean {

appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java
index 5ec5c3d..ca3329b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/servlet/WFStatelessBean2.java
@@ -16,7 +16,7 @@
 
 package wftest;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class WFStatelessBean2 {

appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java
index ca28661..52a1db3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/StatelessBean.java
@@ -15,8 +15,8 @@
  */
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @RolesAllowed("staff")

appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
index 10df505..2bcea0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/servlet/TestServlet.java
@@ -18,7 +18,7 @@
 import java.io.PrintWriter;
 
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.HttpConstraint;

appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java

diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java
index 24ed52e..a82914c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/Sless.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Sless {

appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java
index c65a616..7ccc9a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/StatelessBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless(mappedName="myejb")
 public class StatelessBean implements Sless {

appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
index b1f9656..bb0645e 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
@@ -19,7 +19,7 @@
 import java.io.*;
 
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import jakarta.jms.Queue;
 import javax.naming.InitialContext;
 import javax.servlet.*;

appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java

diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java
index 013643c..cce804e 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/StatelessBean.java
@@ -17,7 +17,7 @@
 package test;
 
 import jakarta.annotation.security.RolesAllowed;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class StatelessBean {

appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java

diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
index dea9830..95ba9dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/servlet/test/TestServlet.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import jakarta.annotation.security.RunAs;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.*;
 import javax.servlet.http.*;
 import javax.servlet.annotation.HttpConstraint;

appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
index d171a73..336e4f8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
@@ -17,8 +17,8 @@
 package servlet;
 
 import java.rmi.*;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 public class ServletHandlerTestImpl implements SessionBean {
     SessionContext sc;

appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java
index 2ba99f5..db3920a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/endpoint/HelloImpl.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import jakarta.xml.ws.Provider;
 import jakarta.xml.ws.WebServiceProvider;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;

appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
index d2f83c7..7c525b4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
@@ -23,7 +23,7 @@
 import jakarta.xml.ws.ServiceMode;
 import jakarta.xml.ws.Service	;	
 import jakarta.xml.soap.SOAPMessage;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;

appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
index 174d8ca..bc27f37 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
@@ -23,7 +23,7 @@
 import jakarta.xml.ws.ServiceMode;
 import jakarta.xml.ws.Service	;	
 import jakarta.xml.soap.SOAPMessage;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;

appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java
index 2849f57..c6749da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/ejb_endpoint/WSHelloEJB.java
@@ -17,7 +17,7 @@
 package ejb_endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java
index 0cd2b3e..eee82d6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHelloEJB.java
@@ -17,7 +17,7 @@
 package ejb_endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(endpointInterface="ejb_endpoint.WSHello")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
index dac32cd..e6e100e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
@@ -23,9 +23,9 @@
 import java.rmi.RemoteException;
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
index a20f8ed..e4a7c10 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/endpoint/AddNumbersImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
index f3fd3d7..372facd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
@@ -16,7 +16,7 @@
 
 package client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import ejb.Hello; 
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
index 12c5ecd..2baa0f0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Hello {

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
index 6faea2c..3fe23ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
@@ -20,7 +20,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.xml.ws.WebServiceRef;
 import jakarta.xml.ws.AsyncHandler;
 import jakarta.xml.ws.Response;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
index a6aeb45..53aa201 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/endpoint/WebServiceEJB.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
index bc9115c..5a057d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
@@ -19,7 +19,7 @@
 import java.math.BigInteger;
 import java.util.*;
 import jakarta.jws.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
index 45b6f86..76dbcd0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
@@ -16,7 +16,7 @@
 
 package client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import ejb.Hello; 
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
index c517daf..86ad44f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Hello {

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
index f29a15f..d95f391 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.xml.ws.WebServiceRef;
 
 import endpoint.WebServiceEJBService;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
index a6aeb45..53aa201 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/endpoint/WebServiceEJB.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
index afc7978..f3ca33c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
@@ -18,12 +18,12 @@
 
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(
     name="Hello",
     serviceName="HelloEjbService",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
index 699d085..d5a7ae8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
@@ -19,10 +19,10 @@
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(
     name="Hello",
     serviceName="HelloService",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
index 7c501ed..d964e8f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
@@ -19,11 +19,11 @@
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.xml.ws.WebServiceContext;
 
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(
     name="Hello",
     serviceName="HelloService",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
index 48ffa7c..a3b9a7c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
@@ -19,10 +19,10 @@
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(
     name="Hello",
     serviceName="HelloService",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
index 8b1a625..86fa82c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
@@ -19,10 +19,10 @@
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
 import jakarta.annotation.Resource;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(
     name="Hello",
     serviceName="HelloService",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
index 7b7ae8a..665690a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
@@ -18,12 +18,12 @@
 
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(
     name="Hello",
     serviceName="HelloService",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
index c4e2990..34ab65f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
@@ -18,12 +18,12 @@
 
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(serviceName = "HelloService", portName = "HelloPort", targetNamespace = "http://example.com/Hello", endpointInterface = "com.example.hello.Hello", wsdlLocation = "WEB-INF/wsdl/HelloService.wsdl")
 
 public class Hello {

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
index c830f08..70084ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
index 9192c67..22025b5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import outsidepkg.RetVal;
 
 @WebService

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
index 9192c67..22025b5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import outsidepkg.RetVal;
 
 @WebService

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
index ac6940a..1ef7a13 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
@@ -16,7 +16,7 @@
 
 package client;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import ejb.Hello; 
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
index c517daf..86ad44f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
@@ -16,7 +16,7 @@
 
 package ejb;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Hello {

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
index f29a15f..d95f391 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
@@ -16,7 +16,7 @@
 
 package ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.xml.ws.WebServiceRef;
 
 import endpoint.WebServiceEJBService;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
index 9ad7562..b9b572f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
@@ -16,7 +16,7 @@
 
 package endpoint;
 
-import javax.ejb.Local;
+import jakarta.ejb.Local;
 
 /**
  *

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
index e7d1fcd..6344440 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
@@ -16,7 +16,7 @@
 
 package endpoint;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  *

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
index 33f2651..e642718 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/WebServiceEJB.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
index 21042cd..91f6459 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
@@ -17,10 +17,10 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
index 54e47c3..0fe6ebf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
index a2c9c32..c06f183 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;
 

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
index 12808a9..eb847ca 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
@@ -27,7 +27,7 @@
 
 import jakarta.jws.WebService;
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @jakarta.jws.WebService(
     serviceName="HttpTestService",
     endpointInterface="service.Hello1",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
index 471cecf..67df4bb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
@@ -27,7 +27,7 @@
 
 import jakarta.jws.WebService;
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @jakarta.jws.WebService(
     serviceName="HttpTestService",
     endpointInterface="service.Hello",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
index 37db4a6..8c1b556 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/HelloEJB.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(endpointInterface="endpoint.Hello")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
index 3a971e9..f6bed8e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/HelloEJB.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(endpointInterface="endpoint.Hello")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
index 974d83c..099d530 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
@@ -18,7 +18,7 @@
 
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import jakarta.xml.ws.WebServiceRef;
 import javax.naming.Context;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
index b194629..5a28123 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
@@ -23,7 +23,7 @@
 import jakarta.xml.ws.ServiceMode;
 import jakarta.xml.ws.Service	;	
 import jakarta.xml.soap.SOAPMessage;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import javax.xml.transform.Source;
 import javax.xml.transform.stream.StreamSource;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
index c5b3b35..cb4b41f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
@@ -31,7 +31,7 @@
 import jakarta.xml.ws.http.HTTPException;
 import jakarta.xml.ws.http.HTTPBinding;
 import jakarta.xml.ws.BindingType;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebServiceProvider
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
index 0c3a144..adc9bfc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.annotation.security.DenyAll;
 import jakarta.annotation.security.PermitAll;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
index e7a1fd6..a0403dc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
@@ -18,7 +18,7 @@
 
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import jakarta.xml.ws.WebServiceRef;
 import javax.naming.Context;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
index a71374b..abd758b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
index 3672901..5ecbcb1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
@@ -17,10 +17,10 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 import java.security.Principal;
 
 @WebService

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
index c4f2804..82cd60f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Singleton;
+import jakarta.ejb.Singleton;
 import outsidepkg.RetVal;
 
 @WebService

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
index d0c8771..c8213bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/HelloEJB.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(endpointInterface="endpoint.Hello")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
index 4d30eb5..93b799c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
@@ -19,7 +19,7 @@
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
 
-@javax.ejb.Stateless
+@jakarta.ejb.Stateless
 @WebService(
     name="Hello",
     serviceName="HelloService",

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
index 59b5c34..ca8dd25 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
@@ -17,10 +17,10 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionContext;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
index 8b3eb0d..06aea64 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 import jakarta.annotation.Resource;
 import jakarta.xml.ws.WebServiceContext;

appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
index e502ee5..f923a48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/endpoint/AddNumbersImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(name="ThisShouldBeIgnored")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
index d9be7b7..1bb0adf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.xml.rpc.handler.MessageContext;
 import java.security.Principal;

appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
index 62aa812..6b935cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
@@ -25,9 +25,9 @@
 import javax.xml.rpc.Call;
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class GoogleEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
index edce913..b34ce51 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
@@ -17,8 +17,8 @@
 package ejb;
 
 import java.rmi.*;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 public class SimpleServerImpl implements SessionBean {
     SessionContext sc;

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
index 234cb66..afab69f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
@@ -18,7 +18,7 @@
 
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(endpointInterface="endpoint.ejb.Hello", targetNamespace="http://endpoint/ejb")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
index 187cce6..d6f94af 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class InterestEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
index 0849a7a..4d1f19f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class InterestEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
index 187cce6..d6f94af 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class InterestEJB implements SessionBean {

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
index a1a1d68..140281c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
@@ -19,8 +19,8 @@
 import java.security.Principal;
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
 import jakarta.annotation.Resource;
 
 @WebService(endpointInterface="endpoint.ejb.Hello", targetNamespace="http://endpoint/ejb")

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
index 19259b1..f9801bb 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
@@ -17,7 +17,7 @@
 package endpoint.jaxws;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(endpointInterface="endpoint.jaxws.Hi",targetNamespace="http://endpoint/jaxws")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java
index f79e075..d05f423 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/HelloEJB.java
@@ -17,7 +17,7 @@
 package endpoint.jaxws;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService(endpointInterface="endpoint.jaxws.Hello", targetNamespace="http://endpoint/jaxws")
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
index 243baad..2788e7c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
@@ -25,7 +25,7 @@
 
 package entapp.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import jakarta.jws.WebMethod;
 import jakarta.jws.WebParam;
 import jakarta.jws.WebService;

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
index a9cd352..b522b9f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
@@ -18,8 +18,8 @@
 
 import jakarta.jws.WebService;
 import jakarta.jws.WebMethod;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 @WebService(
     name="Calculator",

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
index c158118..249df90 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
 
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import jakarta.annotation.Resource;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
index cce8f54..b0b504e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
 
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import jakarta.annotation.Resource;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
index 029907f..91ea7e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
 
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import jakarta.annotation.Resource;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
index 28130f9..8d2468d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
@@ -18,10 +18,10 @@
 
 import jakarta.jws.WebService;
 import jakarta.xml.ws.WebServiceRef;
-import javax.ejb.Stateless;
-import javax.ejb.SessionContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 import jakarta.annotation.Resource;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
index f68cebb..26fd613 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.xml.rpc.handler.MessageContext;
 import java.util.Date;

appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
index 421751a..c0b592e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
@@ -23,9 +23,9 @@
 import java.rmi.RemoteException;
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 

appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
index 6775acc..3ac0fb9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 @WebService
 @Stateless

appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
index 36ff3b0..f45cb45 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class FedTaxEjb implements SessionBean {

appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
index 293abc0..78cea45 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class StateTaxEjb implements SessionBean {

appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
index d171a73..336e4f8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
@@ -17,8 +17,8 @@
 package servlet;
 
 import java.rmi.*;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 public class ServletHandlerTestImpl implements SessionBean {
     SessionContext sc;

appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
index c55506b..4f68723 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
@@ -22,9 +22,9 @@
 
 package soapfault.ejb;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException; 
 
 /**

appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
index 0a693cd..4ec0566 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.xml.rpc.handler.MessageContext;
 

appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
index c003486..b71c4fe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
@@ -22,9 +22,9 @@
 
 package stubprops;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException; 
 
 /**

appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java
index 80905a1..12b6c10 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/endpoint/AddNumbersImpl.java
@@ -17,7 +17,7 @@
 package endpoint;
 
 import jakarta.jws.WebService;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 /**
  * @author Rama Pulavarthi
  */

appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
index 2c69132..e997514 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.xml.rpc.handler.MessageContext;
 

appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java

diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
index 3a21b68..be667d5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 import javax.xml.rpc.handler.MessageContext;
 

appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java

diff --git a/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java b/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
index f2f0c36..f092664 100644
--- a/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
+++ b/appserver/tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.*;
 import javax.naming.*;
 
@@ -57,7 +57,7 @@
   private static int instanceCreated;
   protected String instanceName;
 
-  protected boolean prepareLocalAndRemoteObject(String localRef, String remoteRef) throws javax.ejb.CreateException {
+  protected boolean prepareLocalAndRemoteObject(String localRef, String remoteRef) throws jakarta.ejb.CreateException {
     instanceCreated++;
     instanceName = getClass().getName() + "____________________" + instanceCreated;
 

appserver/tests/appserv-tests/util/reporter/PortableAdapter.java

diff --git a/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java b/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java
index 7515c29..91521d4 100644
--- a/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java
+++ b/appserver/tests/appserv-tests/util/reporter/PortableAdapter.java
@@ -19,9 +19,9 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 import java.util.ArrayList;
 
 public interface PortableAdapter{

appserver/tests/appserv-tests/util/reporter/build.properties

diff --git a/appserver/tests/appserv-tests/util/reporter/build.properties b/appserver/tests/appserv-tests/util/reporter/build.properties
index 315bc1e..cb51aa5 100644
--- a/appserver/tests/appserv-tests/util/reporter/build.properties
+++ b/appserver/tests/appserv-tests/util/reporter/build.properties
@@ -1,5 +1,5 @@
 <property environment="myenv" />
-<property name="javapath" value="${myenv.JAVA_HOME}/lib/dt.jar:$(myenv.JAVA_HOME)/lib/tools.jar:${myenv.S1AS_HOME}/modules/javax.ejb.jar"/>
+<property name="javapath" value="${myenv.JAVA_HOME}/lib/dt.jar:$(myenv.JAVA_HOME)/lib/tools.jar:${myenv.S1AS_HOME}/modules/jakarta.ejb.jar"/>
 
 <property name="classpath" value="${javapath}"/>
 

appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java

diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
index 60f0401..9abaf69 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb1/src/main/java/com/oracle/cdi/cases/devtests/multiejb1/InterceptedEjb1.java
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 

appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java

diff --git a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
index b1abaf3..ee0742a 100644
--- a/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
+++ b/appserver/tests/cdi/cases/multiBeansXml/ejb2/src/main/java/com/oracle/cdi/cases/devtests/multiejb2/InterceptedEjb2.java
@@ -18,8 +18,8 @@
 
 import java.util.List;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 

appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java

diff --git a/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java b/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java
index 14ab507..0a523e6 100644
--- a/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java
+++ b/appserver/tests/cdi/negative/normalScopeWithFinal/src/main/java/com/oracle/cdi/devtest/negative/normalScoped/StatelessEjbWithInjectionPoint.java
@@ -17,7 +17,7 @@
 package com.oracle.cdi.devtest.negative.normalScoped;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 
 /**

appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java

diff --git a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
index 549780d..83b3484 100644
--- a/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
+++ b/appserver/tests/embedded/cdi_ejb_jpa/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.tests.embedded.cdi_ejb_jpa;
 
 //Simple TestBean to test CDI. 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 

appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/SampleEjb.java

diff --git a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/SampleEjb.java b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/SampleEjb.java
index 1b00294..00fe211 100644
--- a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/SampleEjb.java
+++ b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/SampleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.ejb.basic;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Jerome Dochez

appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java

diff --git a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java
index 9b727ec..27b624e 100644
--- a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java
+++ b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java
@@ -16,11 +16,11 @@
 
 package org.glassfish.tests.embedded.ejb.basic;
 
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.Schedule;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Schedule;
 import javax.naming.InitialContext;
 
 @Stateless

appserver/tests/embedded/ejb/ejb-api/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java

diff --git a/appserver/tests/embedded/ejb/ejb-api/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java b/appserver/tests/embedded/ejb/ejb-api/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java
index fa168aa..0f4cb36 100644
--- a/appserver/tests/embedded/ejb/ejb-api/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java
+++ b/appserver/tests/embedded/ejb/ejb-api/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Jerome Dochez

appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java

diff --git a/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java b/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
index 08a24e2..a60e916 100644
--- a/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
+++ b/appserver/tests/embedded/ejb/ejb-api/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
@@ -20,7 +20,7 @@
 import org.junit.Assert;
 import org.glassfish.tests.embedded.ejb.SampleEjb;
 
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import java.util.Map;
 import java.util.HashMap;

appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/RemoteEJB.java

diff --git a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/RemoteEJB.java b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/RemoteEJB.java
index e3a5ba0..8acb721 100644
--- a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/RemoteEJB.java
+++ b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/RemoteEJB.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.embedded.ejb.remoteejb;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 
 /**
  * @author bhavanishankar@java.net

appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/SampleEjb.java

diff --git a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/SampleEjb.java b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/SampleEjb.java
index 4451766..46b5b09 100644
--- a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/SampleEjb.java
+++ b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/SampleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.ejb.remoteejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Jerome Dochez

appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java

diff --git a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java
index dca712c..3496376 100644
--- a/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java
+++ b/appserver/tests/embedded/ejb/remoteejb/src/main/java/org/glassfish/tests/embedded/ejb/remoteejb/TimerEjb.java
@@ -16,11 +16,11 @@
 
 package org.glassfish.tests.embedded.ejb.remoteejb;
 
-import javax.ejb.Stateless;
-import javax.ejb.Timeout;
-import javax.ejb.Timer;
-import javax.ejb.TimerService;
-import javax.ejb.Schedule;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Timeout;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Schedule;
 import javax.naming.InitialContext;
 
 @Stateless

appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java

diff --git a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
index 549780d..83b3484 100644
--- a/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
+++ b/appserver/tests/embedded/glassfish_resources_xml/src/main/java/org/glassfish/tests/embedded/cdi_ejb_jpa/TestBean.java
@@ -17,7 +17,7 @@
 package org.glassfish.tests.embedded.cdi_ejb_jpa;
 
 //Simple TestBean to test CDI. 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 

appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java

diff --git a/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java b/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java
index 25f6a48..503647c 100644
--- a/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java
+++ b/appserver/tests/embedded/maven-plugin/localejbs/src/main/java/org/glassfish/tests/embedded/localejbs/TimerEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.localejbs;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.InitialContext;
 
 @Stateless

appserver/tests/embedded/maven-plugin/mdb/src/main/java/org/glassfish/tests/embedded/mdb/MessageProcessorBean.java

diff --git a/appserver/tests/embedded/maven-plugin/mdb/src/main/java/org/glassfish/tests/embedded/mdb/MessageProcessorBean.java b/appserver/tests/embedded/maven-plugin/mdb/src/main/java/org/glassfish/tests/embedded/mdb/MessageProcessorBean.java
index 4622718..e790b09 100644
--- a/appserver/tests/embedded/maven-plugin/mdb/src/main/java/org/glassfish/tests/embedded/mdb/MessageProcessorBean.java
+++ b/appserver/tests/embedded/maven-plugin/mdb/src/main/java/org/glassfish/tests/embedded/mdb/MessageProcessorBean.java
@@ -16,8 +16,8 @@
 
 package org.glassfish.tests.embedded.mdb;
 
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
+import jakarta.ejb.ActivationConfigProperty;
+import jakarta.ejb.MessageDriven;
 import jakarta.jms.Message;
 import jakarta.jms.MessageListener;
 import jakarta.jms.TextMessage;

appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerEjb.java

diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerEjb.java b/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerEjb.java
index 0a19b3a..422afc4 100644
--- a/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerEjb.java
+++ b/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.remoteejbs;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.InitialContext;
 
 @Stateless

appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerRemote.java

diff --git a/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerRemote.java b/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerRemote.java
index a3c33f8..c935247 100644
--- a/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerRemote.java
+++ b/appserver/tests/embedded/maven-plugin/remoteejbs/src/main/java/org/glassfish/tests/embedded/remoteejbs/TimerRemote.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.remoteejbs;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 /**
  * @author bhavanishankar@dev.java.net

appserver/tests/embedded/static/ejb/simple/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java

diff --git a/appserver/tests/embedded/static/ejb/simple/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java b/appserver/tests/embedded/static/ejb/simple/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java
index fa168aa..0f4cb36 100644
--- a/appserver/tests/embedded/static/ejb/simple/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java
+++ b/appserver/tests/embedded/static/ejb/simple/src/main/java/org/glassfish/tests/embedded/ejb/SampleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.embedded.ejb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Jerome Dochez

appserver/tests/embedded/static/ejb/simple/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java

diff --git a/appserver/tests/embedded/static/ejb/simple/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java b/appserver/tests/embedded/static/ejb/simple/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
index f30aa33..be974a7 100644
--- a/appserver/tests/embedded/static/ejb/simple/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
+++ b/appserver/tests/embedded/static/ejb/simple/src/test/java/org/glassfish/tests/embedded/ejb/test/EmbeddedTest.java
@@ -21,7 +21,7 @@
 import org.glassfish.tests.embedded.ejb.SampleEjb;
 import org.glassfish.internal.embedded.*;
 
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.*;
 import java.util.Map;
 import java.util.HashMap;

appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java

diff --git a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
index dfc5367..a65549e 100644
--- a/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
+++ b/appserver/tests/hk2/cdi/basic/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ejb1/EjbInjectedWithServiceLocator.java
@@ -19,8 +19,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 

appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java

diff --git a/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java b/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java
index f4925f4..dbadddb 100644
--- a/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java
+++ b/appserver/tests/hk2/cdi/ear/ejb1/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb1/Ejb1.java
@@ -16,8 +16,8 @@
 
 package com.oracle.hk2.devtest.cdi.ear.ejb1;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 
 import com.oracle.hk2.devtest.cdi.ear.lib1.HK2Service;

appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java

diff --git a/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java b/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java
index 5622ee7..3015892 100644
--- a/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java
+++ b/appserver/tests/hk2/cdi/ear/ejb2/src/main/java/com/oracle/hk2/devtest/cdi/ear/ejb2/Ejb2.java
@@ -16,8 +16,8 @@
 
 package com.oracle.hk2.devtest.cdi.ear.ejb2;
 
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
+import jakarta.ejb.Remote;
+import jakarta.ejb.Stateless;
 import javax.inject.Inject;
 
 import com.oracle.hk2.devtest.cdi.ear.ejb1.Ejb1HK2Service;

appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/LoginServlet.java

diff --git a/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/LoginServlet.java b/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/LoginServlet.java
index e5d8b4c..9067b95 100644
--- a/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/LoginServlet.java
+++ b/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/LoginServlet.java
@@ -18,7 +18,7 @@
 
 import sahoo.hybridapp.example1.UserAuthService;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;

appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/RegistrationServlet.java

diff --git a/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/RegistrationServlet.java b/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/RegistrationServlet.java
index 2777e40..8157fd7 100644
--- a/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/RegistrationServlet.java
+++ b/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/RegistrationServlet.java
@@ -23,7 +23,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import java.io.PrintWriter;
 
 @WebServlet(urlPatterns = "/registration1")

appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/UserAuthServiceEJB.java

diff --git a/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/UserAuthServiceEJB.java b/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/UserAuthServiceEJB.java
index 8540a2c..8593fdc 100644
--- a/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/UserAuthServiceEJB.java
+++ b/appserver/tests/osgi-javaee/osgi-web/hybridapp1/src/main/java/sahoo/hybridapp/example1/impl/UserAuthServiceEJB.java
@@ -20,7 +20,7 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.Statement;

appserver/tests/paas/mq-shared-service-test/mq-app/ejb/src/main/java/com/sun/s1asdev/ejb/ejb30/hello/mdb/MessageBean.java

diff --git a/appserver/tests/paas/mq-shared-service-test/mq-app/ejb/src/main/java/com/sun/s1asdev/ejb/ejb30/hello/mdb/MessageBean.java b/appserver/tests/paas/mq-shared-service-test/mq-app/ejb/src/main/java/com/sun/s1asdev/ejb/ejb30/hello/mdb/MessageBean.java
index 3f39a82..7e61308 100644
--- a/appserver/tests/paas/mq-shared-service-test/mq-app/ejb/src/main/java/com/sun/s1asdev/ejb/ejb30/hello/mdb/MessageBean.java
+++ b/appserver/tests/paas/mq-shared-service-test/mq-app/ejb/src/main/java/com/sun/s1asdev/ejb/ejb30/hello/mdb/MessageBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1asdev.ejb.ejb30.hello.mdb;
 
 import jakarta.annotation.Resource;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.jms.*;
 
 //Messages received from InQueue

appserver/tests/quicklook/ejb/cmp/metadata/ejb-jar.xml

diff --git a/appserver/tests/quicklook/ejb/cmp/metadata/ejb-jar.xml b/appserver/tests/quicklook/ejb/cmp/metadata/ejb-jar.xml
index 6dd6b15..cc12748 100644
--- a/appserver/tests/quicklook/ejb/cmp/metadata/ejb-jar.xml
+++ b/appserver/tests/quicklook/ejb/cmp/metadata/ejb-jar.xml
@@ -604,7 +604,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -711,7 +711,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -799,7 +799,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/quicklook/ejb/cmp/src/java/roster/Roster.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/roster/Roster.java b/appserver/tests/quicklook/ejb/cmp/src/java/roster/Roster.java
index c1559db..2b2e95c 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/roster/Roster.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/roster/Roster.java
@@ -17,9 +17,9 @@
 package roster;
 
 import java.util.ArrayList;
-import javax.ejb.EJBLocalObject;
-import javax.ejb.FinderException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBLocalObject;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.RemoveException;
 import util.LeagueDetails;
 import util.PlayerDetails;
 import util.TeamDetails;

appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterBean.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterBean.java b/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterBean.java
index 3aaa207..df48213 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterBean.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterBean.java
@@ -17,8 +17,8 @@
 package roster;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.*;
 import team.*;

appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterHome.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterHome.java b/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterHome.java
index f6d8923..3a68b35 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterHome.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/roster/RosterHome.java
@@ -17,8 +17,8 @@
 package roster;
 
 import java.io.Serializable;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 
 public interface RosterHome extends EJBLocalHome {
  

appserver/tests/quicklook/ejb/cmp/src/java/team/LeagueBean.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/LeagueBean.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/LeagueBean.java
index 5f7d4cd..1580e57 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/LeagueBean.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/LeagueBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeague.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeague.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeague.java
index 3f93dd5..f2eb046 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeague.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeague.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
 

appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeagueHome.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeagueHome.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeagueHome.java
index c467a5e..ec176da 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeagueHome.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayer.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayer.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayer.java
index e8846dc..bc0d1b0 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayer.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayer.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
 

appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayerHome.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayerHome.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayerHome.java
index d858503..90458e3 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayerHome.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeam.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeam.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeam.java
index f8ad6c9..914a4cb 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeam.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeam.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
 

appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeamHome.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeamHome.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeamHome.java
index ac2f66c..884657e 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeamHome.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/LocalTeamHome.java
@@ -17,9 +17,9 @@
 package team;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.FinderException;
 
 public interface LocalTeamHome extends EJBLocalHome {
     

appserver/tests/quicklook/ejb/cmp/src/java/team/PlayerBean.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/PlayerBean.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/PlayerBean.java
index 2e2d79a..44b0a8e 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/PlayerBean.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/PlayerBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/quicklook/ejb/cmp/src/java/team/TeamBean.java

diff --git a/appserver/tests/quicklook/ejb/cmp/src/java/team/TeamBean.java b/appserver/tests/quicklook/ejb/cmp/src/java/team/TeamBean.java
index 4f6e907..74fa4d7 100644
--- a/appserver/tests/quicklook/ejb/cmp/src/java/team/TeamBean.java
+++ b/appserver/tests/quicklook/ejb/cmp/src/java/team/TeamBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 import util.PlayerDetails;

appserver/tests/quicklook/ejb/embedded/src/java/SimpleEjb.java

diff --git a/appserver/tests/quicklook/ejb/embedded/src/java/SimpleEjb.java b/appserver/tests/quicklook/ejb/embedded/src/java/SimpleEjb.java
index 3ea9420..c4889fe 100644
--- a/appserver/tests/quicklook/ejb/embedded/src/java/SimpleEjb.java
+++ b/appserver/tests/quicklook/ejb/embedded/src/java/SimpleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.ejb.embedded;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 /**
  * @author Marina Vatkina

appserver/tests/quicklook/ejb/embedded/src/test/Client.java

diff --git a/appserver/tests/quicklook/ejb/embedded/src/test/Client.java b/appserver/tests/quicklook/ejb/embedded/src/test/Client.java
index c69ea6b..798d1e4 100644
--- a/appserver/tests/quicklook/ejb/embedded/src/test/Client.java
+++ b/appserver/tests/quicklook/ejb/embedded/src/test/Client.java
@@ -18,8 +18,8 @@
 
 import org.glassfish.tests.ejb.embedded.SimpleEjb;
 
-import javax.ejb.*;
-import javax.ejb.embeddable.EJBContainer;
+import jakarta.ejb.*;
+import jakarta.ejb.embeddable.EJBContainer;
 import javax.naming.Context;
 import javax.naming.NamingException;
 

appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateful.java

diff --git a/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateful.java b/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateful.java
index cde1a39..65b6508 100755
--- a/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateful.java
+++ b/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateful.java
@@ -16,8 +16,8 @@
 
 package com.sun.mdb;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remove;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remove;
 import jakarta.annotation.PreDestroy;
 
 // Hello1 interface is not annotated with @Local. If the

appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateless.java

diff --git a/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateless.java b/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateless.java
index 08758da..c9ba34b 100755
--- a/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateless.java
+++ b/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/HelloStateless.java
@@ -16,7 +16,7 @@
 
 package com.sun.mdb;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 
 // Hello1 interface is not annotated with @Local. If the
 // bean only implements one interface it is assumed to be

appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/MessageBean.java

diff --git a/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/MessageBean.java b/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/MessageBean.java
index 26d550d..29114ca 100755
--- a/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/MessageBean.java
+++ b/appserver/tests/quicklook/ejb/mdb/src/com/sun/mdb/MessageBean.java
@@ -16,11 +16,11 @@
 
 package com.sun.mdb;
 
-import javax.ejb.MessageDriven;
-import javax.ejb.NoSuchEJBException;
-import javax.ejb.EJB;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
+import jakarta.ejb.MessageDriven;
+import jakarta.ejb.NoSuchEJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.TransactionManagement;
+import jakarta.ejb.TransactionManagementType;
 import jakarta.jms.MessageListener;
 import jakarta.jms.Message;
 import jakarta.jms.Queue;

appserver/tests/quicklook/ejb/remoteview/src/java/Hello.java

diff --git a/appserver/tests/quicklook/ejb/remoteview/src/java/Hello.java b/appserver/tests/quicklook/ejb/remoteview/src/java/Hello.java
index 069928a..58ae275 100644
--- a/appserver/tests/quicklook/ejb/remoteview/src/java/Hello.java
+++ b/appserver/tests/quicklook/ejb/remoteview/src/java/Hello.java
@@ -16,7 +16,7 @@
 
 package remoteview;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 import java.util.concurrent.Future;
 
 @Remote

appserver/tests/quicklook/ejb/remoteview/src/java/HelloBean.java

diff --git a/appserver/tests/quicklook/ejb/remoteview/src/java/HelloBean.java b/appserver/tests/quicklook/ejb/remoteview/src/java/HelloBean.java
index 2f9ab65..f2dcb23 100644
--- a/appserver/tests/quicklook/ejb/remoteview/src/java/HelloBean.java
+++ b/appserver/tests/quicklook/ejb/remoteview/src/java/HelloBean.java
@@ -16,7 +16,7 @@
 
 package remoteview;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 import java.util.concurrent.Future;
 
@@ -77,13 +77,13 @@
     }
 
     public void throwException(String exceptionType) {
-	if( exceptionType.equals("javax.ejb.EJBException") ) {
+	if( exceptionType.equals("jakarta.ejb.EJBException") ) {
 	    throw new EJBException(exceptionType);
-	} else if( exceptionType.equals("javax.ejb.ConcurrentAccessException") ) {
+	} else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessException") ) {
 	    throw new ConcurrentAccessException(exceptionType);
-	} else if( exceptionType.equals("javax.ejb.ConcurrentAccessTimeoutException") ) {
+	} else if( exceptionType.equals("jakarta.ejb.ConcurrentAccessTimeoutException") ) {
 	    throw new ConcurrentAccessTimeoutException(exceptionType);
-	} else if( exceptionType.equals("javax.ejb.IllegalLoopbackException") ) {
+	} else if( exceptionType.equals("jakarta.ejb.IllegalLoopbackException") ) {
 	    throw new IllegalLoopbackException(exceptionType);
 	}
 

appserver/tests/quicklook/ejb/remoteview/src/java/HelloHome.java

diff --git a/appserver/tests/quicklook/ejb/remoteview/src/java/HelloHome.java b/appserver/tests/quicklook/ejb/remoteview/src/java/HelloHome.java
index 3f5e34e..a40a31f 100644
--- a/appserver/tests/quicklook/ejb/remoteview/src/java/HelloHome.java
+++ b/appserver/tests/quicklook/ejb/remoteview/src/java/HelloHome.java
@@ -16,7 +16,7 @@
 
 package remoteview;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 

appserver/tests/quicklook/ejb/remoteview/src/java/HelloRemote.java

diff --git a/appserver/tests/quicklook/ejb/remoteview/src/java/HelloRemote.java b/appserver/tests/quicklook/ejb/remoteview/src/java/HelloRemote.java
index c066d2c..c462bc5 100644
--- a/appserver/tests/quicklook/ejb/remoteview/src/java/HelloRemote.java
+++ b/appserver/tests/quicklook/ejb/remoteview/src/java/HelloRemote.java
@@ -16,7 +16,7 @@
 
 package remoteview;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface HelloRemote extends EJBObject {

appserver/tests/quicklook/ejb/remoteview/src/java/SingletonBean.java

diff --git a/appserver/tests/quicklook/ejb/remoteview/src/java/SingletonBean.java b/appserver/tests/quicklook/ejb/remoteview/src/java/SingletonBean.java
index 567418b..f8230d1 100644
--- a/appserver/tests/quicklook/ejb/remoteview/src/java/SingletonBean.java
+++ b/appserver/tests/quicklook/ejb/remoteview/src/java/SingletonBean.java
@@ -16,7 +16,7 @@
 
 package remoteview;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import jakarta.annotation.*;
 
 @Singleton

appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulBean.java

diff --git a/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulBean.java b/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulBean.java
index ab0f949..c247382 100644
--- a/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulBean.java
+++ b/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulBean.java
@@ -16,7 +16,7 @@
 
 package sfulnoi;
 
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 
 @Stateful
 public class SfulBean {

appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulServlet.java

diff --git a/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulServlet.java b/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulServlet.java
index b329747..c080de4 100644
--- a/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulServlet.java
+++ b/appserver/tests/quicklook/ejb/sfulnoi/src/java/SfulServlet.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 
 public class SfulServlet extends HttpServlet {
    

appserver/tests/quicklook/ejb/singleton/src/java/BeanLeaf.java

diff --git a/appserver/tests/quicklook/ejb/singleton/src/java/BeanLeaf.java b/appserver/tests/quicklook/ejb/singleton/src/java/BeanLeaf.java
index e2a8373..8434e4e 100644
--- a/appserver/tests/quicklook/ejb/singleton/src/java/BeanLeaf.java
+++ b/appserver/tests/quicklook/ejb/singleton/src/java/BeanLeaf.java
@@ -18,9 +18,9 @@
 
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
+import jakarta.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
 
 @Singleton
 public class BeanLeaf {

appserver/tests/quicklook/ejb/singleton/src/java/BeanMessage.java

diff --git a/appserver/tests/quicklook/ejb/singleton/src/java/BeanMessage.java b/appserver/tests/quicklook/ejb/singleton/src/java/BeanMessage.java
index bdb61f8..4bfd0fa 100644
--- a/appserver/tests/quicklook/ejb/singleton/src/java/BeanMessage.java
+++ b/appserver/tests/quicklook/ejb/singleton/src/java/BeanMessage.java
@@ -17,10 +17,10 @@
 package myapp;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.DependsOn;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 @Singleton
 public class BeanMessage implements BeanMessageInterface{

appserver/tests/quicklook/ejb/singleton/src/java/BeanRoot.java

diff --git a/appserver/tests/quicklook/ejb/singleton/src/java/BeanRoot.java b/appserver/tests/quicklook/ejb/singleton/src/java/BeanRoot.java
index 582cccd..21620f8 100644
--- a/appserver/tests/quicklook/ejb/singleton/src/java/BeanRoot.java
+++ b/appserver/tests/quicklook/ejb/singleton/src/java/BeanRoot.java
@@ -18,10 +18,10 @@
 
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.DependsOn;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 @Singleton
 @Startup

appserver/tests/quicklook/ejb/singleton/src/java/TestServlet.java

diff --git a/appserver/tests/quicklook/ejb/singleton/src/java/TestServlet.java b/appserver/tests/quicklook/ejb/singleton/src/java/TestServlet.java
index a025cb6..668a572 100644
--- a/appserver/tests/quicklook/ejb/singleton/src/java/TestServlet.java
+++ b/appserver/tests/quicklook/ejb/singleton/src/java/TestServlet.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.net.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.*;
 
 import javax.servlet.*;

appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java

diff --git a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java
index 5441e9e..c91ddd0 100644
--- a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java
+++ b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedEJB.java
@@ -17,7 +17,7 @@
 package slsbnicmt;
 
 import jakarta.annotation.Resource;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.*;
 import javax.transaction.*;
 

appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedServlet.java

diff --git a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedServlet.java b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedServlet.java
index ee966d5..64bb541 100644
--- a/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedServlet.java
+++ b/appserver/tests/quicklook/ejb/slsbnicmt/src/java/AnnotatedServlet.java
@@ -20,7 +20,7 @@
 import java.net.*;
 import javax.servlet.*;
 import javax.servlet.http.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.sql.DataSource;
 import javax.transaction.UserTransaction;
 import javax.naming.InitialContext;

appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java

diff --git a/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java b/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java
index c9c868f..c172f22 100644
--- a/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java
+++ b/appserver/tests/quicklook/jms/injection/src/java/SimpleEjb.java
@@ -16,7 +16,7 @@
 
 package org.glassfish.tests.jms.injection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.inject.Inject;
 import jakarta.jms.*;
 

appserver/tests/quicklook/jms/injection/src/java/TestServlet.java

diff --git a/appserver/tests/quicklook/jms/injection/src/java/TestServlet.java b/appserver/tests/quicklook/jms/injection/src/java/TestServlet.java
index b702b6c..b828d4d 100644
--- a/appserver/tests/quicklook/jms/injection/src/java/TestServlet.java
+++ b/appserver/tests/quicklook/jms/injection/src/java/TestServlet.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.net.*;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.*;
 
 import javax.servlet.*;

appserver/tests/quicklook/jms/injection/src/test/ClientTestNG.java

diff --git a/appserver/tests/quicklook/jms/injection/src/test/ClientTestNG.java b/appserver/tests/quicklook/jms/injection/src/test/ClientTestNG.java
index d2316ec..149e7fd 100644
--- a/appserver/tests/quicklook/jms/injection/src/test/ClientTestNG.java
+++ b/appserver/tests/quicklook/jms/injection/src/test/ClientTestNG.java
@@ -19,7 +19,7 @@
 import java.io.*;
 import java.net.*;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java

diff --git a/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java b/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java
index f0d7ddf..2bfae16 100644
--- a/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java
+++ b/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestEJB.java
@@ -16,7 +16,7 @@
 
 package myapp;
 
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.persistence.*;
 import java.util.*;
 

appserver/tests/quicklook/persistence/jpavalidation/src/java/TestServlet.java

diff --git a/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestServlet.java b/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestServlet.java
index eaa9721..837d9fb 100644
--- a/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestServlet.java
+++ b/appserver/tests/quicklook/persistence/jpavalidation/src/java/TestServlet.java
@@ -16,7 +16,7 @@
 
 package myapp;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java

diff --git a/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java b/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java
index 3adf11c..faa357f 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/BeanLeaf.java
@@ -18,9 +18,9 @@
 
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.EJB;
-import javax.ejb.DependsOn;
-import javax.ejb.Singleton;
+import jakarta.ejb.EJB;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.Singleton;
 
 @Singleton
 public class BeanLeaf {

appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java

diff --git a/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java b/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java
index 3433db2..b7e3fa6 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/BeanMessage.java
@@ -17,10 +17,10 @@
 package myapp;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.DependsOn;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 @Singleton
 public class BeanMessage implements BeanMessageInterface{

appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java

diff --git a/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java b/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java
index d684981..d934fd1 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/BeanRoot.java
@@ -17,10 +17,10 @@
 package myapp;
 
 import jakarta.annotation.PostConstruct;
-import javax.ejb.DependsOn;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.DependsOn;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 
 import java.io.*;
 import java.security.AccessControlException;

appserver/tests/quicklook/security/appperms/src/java/TestServlet.java

diff --git a/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java b/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java
index e50ba65..f77abed 100644
--- a/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java
+++ b/appserver/tests/quicklook/security/appperms/src/java/TestServlet.java
@@ -21,7 +21,7 @@
 import java.security.AccessControlException;
 import java.security.AccessController;
 
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.naming.*;
 
 import javax.servlet.*;

appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java

diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
index 2b37761..ebe869d 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorA.java
@@ -18,7 +18,7 @@
 
 import javax.interceptor.*;
 import jakarta.annotation.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import javax.inject.Inject;
 import java.io.Serializable;
 

appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java

diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
index ffbde95..c346144 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/InterceptorB.java
@@ -21,8 +21,8 @@
 import javax.interceptor.*;
 import jakarta.annotation.*;
 
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
 
 import javax.inject.Inject;
 

appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java

diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
index 4c3d0a6..8e3167f 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/SingletonBean.java
@@ -19,10 +19,10 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Singleton;
+import jakarta.ejb.Startup;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 

appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java

diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java
index 85513f0..7c7711e 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatefulBean.java
@@ -19,10 +19,10 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import jakarta.annotation.Resource;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateful;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.Stateful;
 import javax.interceptor.Interceptors;
 
 @Stateful

appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatelessBean.java

diff --git a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatelessBean.java b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatelessBean.java
index 59d0f30..f251b52 100644
--- a/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatelessBean.java
+++ b/appserver/tests/quicklook/weld/numberguess/src/java/numberguess/StatelessBean.java
@@ -18,8 +18,8 @@
 
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 
 @Stateless
 public class StatelessBean implements StatelessLocal {

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Course.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Course.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Course.java
index 8c8d171..d2a4674 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Course.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Course.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseBean.java
index e91eea7..aa8eec0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseHome.java
index 11b68d5..a969a3b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/CourseHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
 
 public interface CourseHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Enroller.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Enroller.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Enroller.java
index 3d3aec8..1ed88fd 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Enroller.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Enroller.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Enroller extends EJBObject {

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerBean.java
index 053d361..ce9877f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerHome.java
index 45ce224..2a6b49d 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface EnrollerHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Student.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Student.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Student.java
index 890c3de..6a8bd29 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Student.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentBean.java
index e4ac139..b45e517 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentHome.java
index c9897b5..2ae3de5 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/appclient/mainclassoption/enroller/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterBean.java
index 33a526d..c73ac2f 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterBean.java
@@ -18,13 +18,13 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.TimedObject;
-import javax.ejb.TimerService;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.EJBException;
 import javax.xml.parsers.*;
 
 /**

appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemote.java
index 862f3aa..3729fc7 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.ejb.stateless.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemoteHome.java
index 591f1d5..9d263cd 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/classloader/stateless/converter/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface ConverterRemoteHome extends EJBHome {
     ConverterRemote create() throws RemoteException, CreateException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTest.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTest.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTest.java
index 3bd36af..887bd60 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTest.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTest.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface BlobTest extends javax.ejb.EJBObject {
+public interface BlobTest extends jakarta.ejb.EJBObject {
     public byte[] getBlb() throws java.rmi.RemoteException;
 
     public byte[] getByteblb() throws java.rmi.RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestBean.java
index 8eb5af9..706fdca 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -24,21 +24,21 @@
  */
 
 
-public abstract class BlobTestBean implements javax.ejb.EntityBean {
+public abstract class BlobTestBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -46,7 +46,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -54,7 +54,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: BlobTest ejbRemove");
@@ -62,7 +62,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -70,7 +70,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -78,7 +78,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -103,7 +103,7 @@
     public abstract byte[] getByteblb2();
     public abstract void setByteblb2(byte[] b);
 
-    public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
 
         setId(id);
         setName(name);
@@ -114,7 +114,7 @@
         return null;
     }
     
-    public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+    public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
     }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestHome.java
index 5c79db8..e9e7791 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blob/ejb/BlobTestHome.java
@@ -16,17 +16,17 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface BlobTestHome extends javax.ejb.EJBHome {
+public interface BlobTestHome extends jakarta.ejb.EJBHome {
     
-    public  BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, jakarta.ejb.FinderException;
 
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTest.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTest.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTest.java
index 3bd36af..887bd60 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTest.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTest.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface BlobTest extends javax.ejb.EJBObject {
+public interface BlobTest extends jakarta.ejb.EJBObject {
     public byte[] getBlb() throws java.rmi.RemoteException;
 
     public byte[] getByteblb() throws java.rmi.RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestBean.java
index 8eb5af9..706fdca 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -24,21 +24,21 @@
  */
 
 
-public abstract class BlobTestBean implements javax.ejb.EntityBean {
+public abstract class BlobTestBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -46,7 +46,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -54,7 +54,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: BlobTest ejbRemove");
@@ -62,7 +62,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -70,7 +70,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -78,7 +78,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -103,7 +103,7 @@
     public abstract byte[] getByteblb2();
     public abstract void setByteblb2(byte[] b);
 
-    public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
 
         setId(id);
         setName(name);
@@ -114,7 +114,7 @@
         return null;
     }
     
-    public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws javax.ejb.CreateException {
+    public void ejbPostCreate(Integer id, java.lang.String name, byte[] b) throws jakarta.ejb.CreateException {
     }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestHome.java
index 5c79db8..e9e7791 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/blobJava2DB/ejb/BlobTestHome.java
@@ -16,17 +16,17 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface BlobTestHome extends javax.ejb.EJBHome {
+public interface BlobTestHome extends jakarta.ejb.EJBHome {
     
-    public  BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  BlobTest create(Integer i, java.lang.String name, byte[] b) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  BlobTest findByPrimaryKey (Integer key) throws java.rmi.RemoteException, jakarta.ejb.FinderException;
 
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/A.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/A.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/A.java
index 0398b68..8c4a937 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/A.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/A.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:09 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface A extends javax.ejb.EJBObject {
+public interface A extends jakarta.ejb.EJBObject {
     
     public void addAll() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/ABean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/ABean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/ABean.java
index e29116a..f671c75 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/ABean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/ABean.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.util.*;
 
@@ -27,9 +27,9 @@
  */
 
 
-public abstract class ABean implements javax.ejb.EntityBean {
+public abstract class ABean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     LocalBHome bhome;
     LocalCHome chome;
     LocalDHome dhome;
@@ -37,9 +37,9 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
         try {
             bhome = lookupB();
@@ -52,7 +52,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -60,7 +60,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -68,7 +68,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A ejbRemove");
@@ -84,7 +84,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -92,7 +92,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -100,7 +100,7 @@
 
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -124,13 +124,13 @@
     
     public abstract void setBs(java.util.Collection bs);
     
-    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
         setId(id);
         setName(name);
         return null;
     }
     
-    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
     }
     
     public void addAll() {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/AHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/AHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/AHome.java
index 7f2f26c..0deba24 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/AHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/AHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:09 PM
@@ -24,13 +24,13 @@
  * @author mvatkina
  */
 
-public interface AHome extends javax.ejb.EJBHome {
+public interface AHome extends jakarta.ejb.EJBHome {
     
     public cascadeDelete.A findByPrimaryKey(java.lang.Integer aKey)
-    throws javax.ejb.FinderException, java.rmi.RemoteException;
+    throws jakarta.ejb.FinderException, java.rmi.RemoteException;
     
-    public A create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public A create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public java.util.Collection findAll() throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public java.util.Collection findAll() throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/B.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/B.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/B.java
index fef3619..7110b8c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/B.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/B.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:06 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface B extends javax.ejb.EJBObject {
+public interface B extends jakarta.ejb.EJBObject {
     
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BBean.java
index 72bdd0c..bc75f0e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BBean.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:06 PM
@@ -25,23 +25,23 @@
  */
 
 
-public abstract class BBean implements javax.ejb.EntityBean {
+public abstract class BBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     private boolean cascadeDeleteFromA = false;
     private boolean cascadeDeleteFromC = false;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -49,7 +49,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -57,7 +57,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: B ejbRemove");
@@ -87,7 +87,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -95,7 +95,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         cascadeDeleteFromA = false;
@@ -105,7 +105,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -129,13 +129,13 @@
     
     public abstract void setA(cascadeDelete.LocalA a);
     
-    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
         setId(id);
         setName(name);
         return null;
     }
     
-    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
     }
 
     public void cascadeDeleteFromA() {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BHome.java
index fe27f45..2f4c132 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/BHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:06 PM
@@ -24,12 +24,12 @@
  * @author mvatkina
  */
 
-public interface BHome extends javax.ejb.EJBHome {
+public interface BHome extends jakarta.ejb.EJBHome {
     
-    public cascadeDelete.B findByPrimaryKey(java.lang.Integer aKey) throws javax.ejb.FinderException, java.rmi.RemoteException;
+    public cascadeDelete.B findByPrimaryKey(java.lang.Integer aKey) throws jakarta.ejb.FinderException, java.rmi.RemoteException;
     
-    public java.util.Collection findAll() throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public java.util.Collection findAll() throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public B create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public B create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/C.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/C.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/C.java
index e9bde03..1d1d337 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/C.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/C.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:05 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface C extends javax.ejb.EJBObject {
+public interface C extends jakarta.ejb.EJBObject {
     
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CBean.java
index faf4950..d600b91 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CBean.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:05 PM
@@ -25,23 +25,23 @@
  */
 
 
-public abstract class CBean implements javax.ejb.EntityBean {
+public abstract class CBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     private boolean cascadeDeleteFromA = false;
     private boolean cascadeDeleteFromB = false;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -49,7 +49,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -57,7 +57,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: C ejbRemove");
@@ -84,7 +84,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -92,7 +92,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         cascadeDeleteFromA = false;
@@ -102,7 +102,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -126,13 +126,13 @@
     
     public abstract void setB(cascadeDelete.LocalB b);
     
-    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
         setId(id);
         setName(name);
         return null;
     }
     
-    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
     }
     
     public void cascadeDeleteFromA() {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CHome.java
index 2c96e7f..75376b8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/CHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:05 PM
@@ -24,12 +24,12 @@
  * @author mvatkina
  */
 
-public interface CHome extends javax.ejb.EJBHome {
+public interface CHome extends jakarta.ejb.EJBHome {
     
-    public cascadeDelete.C findByPrimaryKey(java.lang.Integer aKey) throws javax.ejb.FinderException, java.rmi.RemoteException;
+    public cascadeDelete.C findByPrimaryKey(java.lang.Integer aKey) throws jakarta.ejb.FinderException, java.rmi.RemoteException;
     
-    public java.util.Collection findAll() throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public java.util.Collection findAll() throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public C create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public C create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/D.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/D.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/D.java
index 4210bd8..3ad44aa 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/D.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/D.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:03 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface D extends javax.ejb.EJBObject {
+public interface D extends jakarta.ejb.EJBObject {
     
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DBean.java
index 72f3505..313635a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DBean.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:03 PM
@@ -25,21 +25,21 @@
  */
 
 
-public abstract class DBean implements javax.ejb.EntityBean {
+public abstract class DBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: D ejbRemove");
@@ -73,7 +73,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -81,7 +81,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -89,7 +89,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -113,13 +113,13 @@
     
     public abstract void setC(cascadeDelete.LocalC c);
     
-    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
         setId(id);
         setName(name);
         return null;
     }
     
-    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws javax.ejb.CreateException {
+    public void ejbPostCreate(java.lang.Integer id, java.lang.String name) throws jakarta.ejb.CreateException {
     }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DHome.java
index 17a220c..5f09b85 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/DHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:03 PM
@@ -24,12 +24,12 @@
  * @author mvatkina
  */
 
-public interface DHome extends javax.ejb.EJBHome {
+public interface DHome extends jakarta.ejb.EJBHome {
     
-    public cascadeDelete.D findByPrimaryKey(java.lang.Integer aKey) throws javax.ejb.FinderException, java.rmi.RemoteException;
+    public cascadeDelete.D findByPrimaryKey(java.lang.Integer aKey) throws jakarta.ejb.FinderException, java.rmi.RemoteException;
     
-    public java.util.Collection findAll() throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public java.util.Collection findAll() throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public D create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public D create(java.lang.Integer id, java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalA.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalA.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalA.java
index 7c97fe6..80839ee 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalA.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalA.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:09 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface LocalA extends javax.ejb.EJBLocalObject {
+public interface LocalA extends jakarta.ejb.EJBLocalObject {
     
     public String getName();
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalAHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalAHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalAHome.java
index 8f23367..d0b9579 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalAHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalAHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:09 PM
@@ -24,11 +24,11 @@
  * @author mvatkina
  */
 
-public interface LocalAHome extends javax.ejb.EJBLocalHome {
+public interface LocalAHome extends jakarta.ejb.EJBLocalHome {
     
     public cascadeDelete.LocalA findByPrimaryKey(java.lang.Integer aKey)
-    throws javax.ejb.FinderException;
+    throws jakarta.ejb.FinderException;
     
-    public java.util.Collection findAll() throws javax.ejb.FinderException;
+    public java.util.Collection findAll() throws jakarta.ejb.FinderException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalB.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalB.java
index ac22e4c..089f0ca 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalB.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:06 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface LocalB extends javax.ejb.EJBLocalObject {
+public interface LocalB extends jakarta.ejb.EJBLocalObject {
     
     public java.lang.Integer getId();
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalBHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalBHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalBHome.java
index 976867b..13cdfa3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalBHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalBHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:06 PM
@@ -24,11 +24,11 @@
  * @author mvatkina
  */
 
-public interface LocalBHome extends javax.ejb.EJBLocalHome {
+public interface LocalBHome extends jakarta.ejb.EJBLocalHome {
     
     public cascadeDelete.LocalB findByPrimaryKey(java.lang.Integer aKey)
-    throws javax.ejb.FinderException;
+    throws jakarta.ejb.FinderException;
     
-    public java.util.Collection findAll() throws javax.ejb.FinderException;
+    public java.util.Collection findAll() throws jakarta.ejb.FinderException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalC.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalC.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalC.java
index 8748133..44d38b9 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalC.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalC.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:05 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface LocalC extends javax.ejb.EJBLocalObject {
+public interface LocalC extends jakarta.ejb.EJBLocalObject {
     
     public java.util.Collection getDs();
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalCHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalCHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalCHome.java
index 2501fa7..b266756 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalCHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalCHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:05 PM
@@ -24,11 +24,11 @@
  * @author mvatkina
  */
 
-public interface LocalCHome extends javax.ejb.EJBLocalHome {
+public interface LocalCHome extends jakarta.ejb.EJBLocalHome {
     
     public cascadeDelete.LocalC findByPrimaryKey(java.lang.Integer aKey)
-    throws javax.ejb.FinderException;
+    throws jakarta.ejb.FinderException;
     
-    public java.util.Collection findAll() throws javax.ejb.FinderException;
+    public java.util.Collection findAll() throws jakarta.ejb.FinderException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalD.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalD.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalD.java
index 6379ce6..785022d 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalD.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalD.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:03 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface LocalD extends javax.ejb.EJBLocalObject {
+public interface LocalD extends jakarta.ejb.EJBLocalObject {
     
     public String getName();
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalDHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalDHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalDHome.java
index d120311..3efc4de 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalDHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/cascadeDelete/ejb/LocalDHome.java
@@ -16,7 +16,7 @@
 
 package cascadeDelete;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 23, 2002 12:43:03 PM
@@ -24,13 +24,13 @@
  * @author mvatkina
  */
 
-public interface LocalDHome extends javax.ejb.EJBLocalHome {
+public interface LocalDHome extends jakarta.ejb.EJBLocalHome {
     
     public cascadeDelete.LocalD findByPrimaryKey(java.lang.Integer aKey)
-    throws javax.ejb.FinderException;
+    throws jakarta.ejb.FinderException;
     
-    public java.util.Collection findAll() throws javax.ejb.FinderException;
+    public java.util.Collection findAll() throws jakarta.ejb.FinderException;
     
-    public java.util.Collection findInRange(java.lang.Integer p0, java.lang.Integer p1) throws javax.ejb.FinderException;
+    public java.util.Collection findInRange(java.lang.Integer p0, java.lang.Integer p1) throws jakarta.ejb.FinderException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/A.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/A.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/A.java
index e398d7b..fb87acd 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/A.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/A.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A extends javax.ejb.EJBObject {
+public interface A extends jakarta.ejb.EJBObject {
     
     public void test() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/ABean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/ABean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/ABean.java
index ca2c0f1..d881218 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/ABean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/ABean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -24,21 +24,21 @@
  */
 
 
-public abstract class ABean implements javax.ejb.EntityBean {
+public abstract class ABean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -46,7 +46,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -54,7 +54,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: ABean ejbRemove");
@@ -62,7 +62,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -70,7 +70,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -78,7 +78,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -97,7 +97,7 @@
     public abstract void setBlb(byte[] b);
 
     public java.lang.Integer ejbCreate(Integer id, java.lang.String name, java.util.Date date, byte[] b) 
-        throws javax.ejb.CreateException {
+        throws jakarta.ejb.CreateException {
 
         setId(id);
         setName(name);
@@ -108,7 +108,7 @@
     }
     
     public void ejbPostCreate(Integer id, java.lang.String name, java.util.Date date, byte[] b) 
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
     public void test() {
         java.util.Date d1 = getDate();

appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/AHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/AHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/AHome.java
index 662556c..822b1c0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/AHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/copySemantics/ejb/AHome.java
@@ -16,15 +16,15 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface AHome extends javax.ejb.EJBHome {
+public interface AHome extends jakarta.ejb.EJBHome {
     
-    public  A create(Integer i, java.lang.String name, java.util.Date d, byte[] b) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A create(Integer i, java.lang.String name, java.util.Date d, byte[] b) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/client/Client.java
index fde3107..15d1b1b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/client/Client.java
@@ -91,12 +91,12 @@
      * If ejbPostCreate throws CreateException, the transaction is committed.
      */
     private static void runCreateException20Test() throws java.rmi.RemoteException, 
-            javax.ejb.FinderException, javax.ejb.RemoveException {
+            jakarta.ejb.FinderException, jakarta.ejb.RemoveException {
 
         // Test CreateException from ejbPostCreate
         try {
             a2home.create("A2");
-        } catch (javax.ejb.CreateException e) {
+        } catch (jakarta.ejb.CreateException e) {
             System.out.println("Caught expected CreateException: " + e.getMessage());
         }
 
@@ -107,7 +107,7 @@
         // Test CreateException from ejbCreate 
         try {
             a2home.create();
-        } catch (javax.ejb.CreateException e) {
+        } catch (jakarta.ejb.CreateException e) {
             System.out.println("Caught expected CreateException: " + e.getMessage());
         }
 
@@ -121,7 +121,7 @@
         // Test 2.0 bean with Unknown PK for CreateException from ejbPostCreate.
         try {
             a2unhome.create("A2");
-        } catch (javax.ejb.CreateException e) {
+        } catch (jakarta.ejb.CreateException e) {
             System.out.println("Caught expected CreateException: " + e.getMessage());
         }
 
@@ -141,12 +141,12 @@
      * If ejbPostCreate throws CreateException, the transaction is committed.
      */
     private static void runCreateException11Test() throws java.rmi.RemoteException, 
-            javax.ejb.FinderException, javax.ejb.RemoveException {
+            jakarta.ejb.FinderException, jakarta.ejb.RemoveException {
 
         // Test CreateException from ejbPostCreate
         try {
             a1home.create("A1");
-        } catch (javax.ejb.CreateException e) {
+        } catch (jakarta.ejb.CreateException e) {
             System.out.println("Caught expected CreateException: " + e.getMessage());
         }
 
@@ -157,7 +157,7 @@
         // Test CreateException from ejbPostCreate without a container transaction.
         try {
             a1home.create("A11", true); 
-        } catch (javax.ejb.CreateException e) {
+        } catch (jakarta.ejb.CreateException e) {
             System.out.println("Caught expected CreateException: " + e.getMessage());
         }
 
@@ -180,7 +180,7 @@
         // Test CreateException from ejbCreate without a container transaction.
         try {
             a1home.create("A111", false); 
-        } catch (javax.ejb.CreateException e) {
+        } catch (jakarta.ejb.CreateException e) {
             System.out.println("Caught expected CreateException: " + e.getMessage());
         }
 
@@ -195,7 +195,7 @@
         // Test 1.1 bean with Unknown PK for CreateException from ejbPostCreate.
         try {
             a1unhome.create("A1");
-        } catch (javax.ejb.CreateException e) {
+        } catch (jakarta.ejb.CreateException e) {
             System.out.println("Caught expected CreateException: " + e.getMessage());
         }
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1.java
index 1012512..3de1f8c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1.java
@@ -16,14 +16,14 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1 extends javax.ejb.EJBObject {
+public interface A1 extends jakarta.ejb.EJBObject {
  
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Bean.java
index 91e71f5..dfa89a8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Bean.java
@@ -16,7 +16,7 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public class A1Bean implements javax.ejb.EntityBean {
+public class A1Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A1Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -89,39 +89,39 @@
     /** This ejbCreate/ejbPostCreate combination tests CreateException
      * thrown from ejbPostCreate.
      */
-    public java.lang.String ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.String ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         this.name = name;
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException { 
-        throw new javax.ejb.CreateException("A1Bean.ejbPostCreate");
+    public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException { 
+        throw new jakarta.ejb.CreateException("A1Bean.ejbPostCreate");
     }
     
     /** This ejbCreate/ejbPostCreate combination tests CreateException
      * thrown from either ejbCreate (if b is false) or ejbPostCreate.
      * Executed in a non-transactional context to test both options.
      */
-    public java.lang.String ejbCreate(java.lang.String name, boolean b)  throws javax.ejb.CreateException {
+    public java.lang.String ejbCreate(java.lang.String name, boolean b)  throws jakarta.ejb.CreateException {
         if (b) {
              this.name = name;
         } else { 
-             throw new javax.ejb.CreateException("A1Bean.ejbCreate");
+             throw new jakarta.ejb.CreateException("A1Bean.ejbCreate");
         }
         return null;
     }
 
-    public void ejbPostCreate(java.lang.String name, boolean b)   throws javax.ejb.CreateException {
+    public void ejbPostCreate(java.lang.String name, boolean b)   throws jakarta.ejb.CreateException {
         if (b) {
-             throw new javax.ejb.CreateException("A1Bean.ejbPostCreate");
+             throw new jakarta.ejb.CreateException("A1Bean.ejbPostCreate");
        }
     }
 
     /** This ejbCreate/ejbPostCreate combination tests that bean state is
      * reset prior to call to ejbCreate.
      */
-    public java.lang.String ejbCreate(int i)  throws javax.ejb.CreateException {
+    public java.lang.String ejbCreate(int i)  throws jakarta.ejb.CreateException {
         if (this.name != null) { 
              throw new java.lang.IllegalStateException("A1Bean.ejbCreate not reset");
         }
@@ -130,7 +130,7 @@
         return null;
     }
 
-    public void ejbPostCreate(int i)   throws javax.ejb.CreateException {
+    public void ejbPostCreate(int i)   throws jakarta.ejb.CreateException {
     }
 
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Home.java
index 8d6b9a4..b68dce9 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1Home.java
@@ -16,23 +16,23 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1Home extends javax.ejb.EJBHome {
+public interface A1Home extends jakarta.ejb.EJBHome {
     
-    public  A1 findByPrimaryKey(java.lang.String pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A1 findByPrimaryKey(java.lang.String pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  java.util.Collection findAll()  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  java.util.Collection findAll()  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  A1 create(java.lang.String name, boolean b) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(java.lang.String name, boolean b) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  A1 create(int i) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(int i) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKBean.java
index b5bba50..2c279c9 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKBean.java
@@ -16,7 +16,7 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public class A1UnPKBean implements javax.ejb.EntityBean {
+public class A1UnPKBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A1UnPKBean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -89,20 +89,20 @@
     /** This ejbCreate/ejbPostCreate combination tests CreateException 
      * thrown from ejbPostCreate. 
      */
-    public java.lang.Object ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.Object ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         this.name = name;
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException { 
-        throw new javax.ejb.CreateException("A1UnPKBean.ejbPostCreate");
+    public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException { 
+        throw new jakarta.ejb.CreateException("A1UnPKBean.ejbPostCreate");
     }
     
     /** This ejbCreate/ejbPostCreate combination tests that bean state is
      * reset prior to call to ejbCreate.
      */
-    public java.lang.Object ejbCreate(int i)  throws javax.ejb.CreateException {
+    public java.lang.Object ejbCreate(int i)  throws jakarta.ejb.CreateException {
         if (this.name != null) {
              throw new java.lang.IllegalStateException("A1UnPKBean.ejbCreate not reset");
         }
@@ -111,7 +111,7 @@
         return null;
     }
 
-    public void ejbPostCreate(int i)   throws javax.ejb.CreateException {
+    public void ejbPostCreate(int i)   throws jakarta.ejb.CreateException {
     }
 
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKHome.java
index a9f1298..0f88cdc 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A1UnPKHome.java
@@ -16,19 +16,19 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1UnPKHome extends javax.ejb.EJBHome {
+public interface A1UnPKHome extends jakarta.ejb.EJBHome {
     
-    public  java.util.Collection findAll()  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  java.util.Collection findAll()  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  A1 create(int i) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(int i) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2.java
index a84dee8..079f0ea 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2.java
@@ -16,13 +16,13 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2 extends javax.ejb.EJBObject {
+public interface A2 extends jakarta.ejb.EJBObject {
  
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Bean.java
index d8fe258..8fd4ba5 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Bean.java
@@ -16,7 +16,7 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public abstract class A2Bean implements javax.ejb.EntityBean {
+public abstract class A2Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A2Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -90,30 +90,30 @@
     /** This ejbCreate/ejbPostCreate combination tests CreateException 
      * thrown from ejbPostCreate. 
      */
-    public java.lang.String ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.String ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         setName(name);
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException { 
-        throw new javax.ejb.CreateException("A2Bean.ejbPostCreate");
+    public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException { 
+        throw new jakarta.ejb.CreateException("A2Bean.ejbPostCreate");
     }
 
     /** This ejbCreate/ejbPostCreate combination tests CreateException 
      * thrown from ejbCreate. 
      */
-    public java.lang.String ejbCreate() throws javax.ejb.CreateException {
-       throw new javax.ejb.CreateException("A2Bean.ejbCreate");
+    public java.lang.String ejbCreate() throws jakarta.ejb.CreateException {
+       throw new jakarta.ejb.CreateException("A2Bean.ejbCreate");
     }
 
-    public void ejbPostCreate() throws javax.ejb.CreateException {
+    public void ejbPostCreate() throws jakarta.ejb.CreateException {
     }
     
     /** This ejbCreate/ejbPostCreate combination tests that bean state is
      * reset prior to call to ejbCreate.
      */
-    public java.lang.String ejbCreate(int i)  throws javax.ejb.CreateException {
+    public java.lang.String ejbCreate(int i)  throws jakarta.ejb.CreateException {
         if (getName() != null) {
              throw new java.lang.IllegalStateException("A2Bean.ejbCreate not reset");
         }
@@ -122,7 +122,7 @@
         return null;
     }
 
-    public void ejbPostCreate(int i)   throws javax.ejb.CreateException {
+    public void ejbPostCreate(int i)   throws jakarta.ejb.CreateException {
     }
 
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Home.java
index 80393b5..cfc9e37 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2Home.java
@@ -16,23 +16,23 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2Home extends javax.ejb.EJBHome {
+public interface A2Home extends jakarta.ejb.EJBHome {
     
-    public  A2 findByPrimaryKey(java.lang.String pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A2 findByPrimaryKey(java.lang.String pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  java.util.Collection findAll()  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  java.util.Collection findAll()  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  A2 create() throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create() throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  A2 create(int i) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create(int i) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKBean.java
index c45beaf..3ae3ab8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKBean.java
@@ -16,7 +16,7 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public abstract class A2UnPKBean implements javax.ejb.EntityBean {
+public abstract class A2UnPKBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A2UnPKBean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -90,20 +90,20 @@
     /** This ejbCreate/ejbPostCreate combination tests CreateException 
      * thrown from ejbPostCreate. 
      */
-    public java.lang.Object ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public java.lang.Object ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         setName(name);
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException { 
-        throw new javax.ejb.CreateException("A2UnPKBean.ejbPostCreate");
+    public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException { 
+        throw new jakarta.ejb.CreateException("A2UnPKBean.ejbPostCreate");
     }
     
     /** This ejbCreate/ejbPostCreate combination tests that bean state is
      * reset prior to call to ejbCreate.
      */
-    public java.lang.Object ejbCreate(int i)  throws javax.ejb.CreateException {
+    public java.lang.Object ejbCreate(int i)  throws jakarta.ejb.CreateException {
         if (getName() != null) {
              throw new java.lang.IllegalStateException("A2UnPKBean.ejbCreate not reset"); 
         }
@@ -112,7 +112,7 @@
         return null;
     }
 
-    public void ejbPostCreate(int i)   throws javax.ejb.CreateException {
+    public void ejbPostCreate(int i)   throws jakarta.ejb.CreateException {
     }
 
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKHome.java
index 4b00b9c..e355d91 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/createExceptionsTest/ejb/A2UnPKHome.java
@@ -16,19 +16,19 @@
 
 package create;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2UnPKHome extends javax.ejb.EJBHome {
+public interface A2UnPKHome extends jakarta.ejb.EJBHome {
     
-    public  java.util.Collection findAll()  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  java.util.Collection findAll()  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
-    public  A2 create(int i) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create(int i) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/client/Client.java
index 9779c29..3f02094 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/client/Client.java
@@ -59,7 +59,7 @@
             try {
                 t.testA1();
                 System.out.println("A1 FAILED");
-            } catch (javax.ejb.CreateException e) {
+            } catch (jakarta.ejb.CreateException e) {
                 System.out.println("A1 FAILED");
             } catch (Exception e) {
                 System.out.println("A1 OK");
@@ -70,7 +70,7 @@
             try {
                 t.testA2();
                 System.out.println("A2 FAILED");
-            } catch (javax.ejb.CreateException e) {
+            } catch (jakarta.ejb.CreateException e) {
                 System.out.println("A1 FAILED");
             } catch (Exception e) {
                 System.out.println("A2 OK");

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Bean.java
index e7a2e9c..e37cd7b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Bean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * 1.1 bean. 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Local.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Local.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Local.java
index 7f8e7a6..24a93aa 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Local.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1Local.java
@@ -16,13 +16,13 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1Local extends javax.ejb.EJBLocalObject {
+public interface A1Local extends jakarta.ejb.EJBLocalObject {
 
     public void setName(String name); 
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1LocalHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1LocalHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1LocalHome.java
index f4a7b78..dfe5413 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1LocalHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A1LocalHome.java
@@ -16,17 +16,17 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1LocalHome extends javax.ejb.EJBLocalHome {
+public interface A1LocalHome extends jakarta.ejb.EJBLocalHome {
     
-    public  A1Local findByPrimaryKey(java.lang.String pk)  throws javax.ejb.FinderException;
+    public  A1Local findByPrimaryKey(java.lang.String pk)  throws jakarta.ejb.FinderException;
     
-    public  A1Local create(java.lang.String id) throws javax.ejb.CreateException;
+    public  A1Local create(java.lang.String id) throws jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Bean.java
index 1620b4f..8064190 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Bean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * 2.0 bean. 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Local.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Local.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Local.java
index d640319..be14b82 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Local.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2Local.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2Local extends javax.ejb.EJBLocalObject {
+public interface A2Local extends jakarta.ejb.EJBLocalObject {
 
     public void setName(String name); 
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2LocalHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2LocalHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2LocalHome.java
index 85351b1..d54b444 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2LocalHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/A2LocalHome.java
@@ -16,17 +16,17 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2LocalHome extends javax.ejb.EJBLocalHome {
+public interface A2LocalHome extends jakarta.ejb.EJBLocalHome {
     
-    public  A2Local findByPrimaryKey(java.lang.String pk)  throws javax.ejb.FinderException;
+    public  A2Local findByPrimaryKey(java.lang.String pk)  throws jakarta.ejb.FinderException;
     
-    public  A2Local create(java.lang.String name) throws javax.ejb.CreateException;
+    public  A2Local create(java.lang.String name) throws jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/Test.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/Test.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/Test.java
index 8268426..3e9be5d 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/Test.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/Test.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface Test extends EJBObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestBean.java
index 365cc2d..936675e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**

appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestHome.java
index 745516c..4995503 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/ejbflush/ejb/TestHome.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface TestHome extends EJBHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1.java
index 31ad889..63fffdf 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1.java
@@ -16,14 +16,14 @@
 
 package fieldtest;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1 extends javax.ejb.EJBObject {
+public interface A1 extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Bean.java
index 7a5a925..679952b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Bean.java
@@ -16,7 +16,7 @@
 
 package fieldtest;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,54 +25,54 @@
  */
 
 
-public class A1Bean implements javax.ejb.EntityBean {
+public class A1Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A1Bean ejbRemove");
     }
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -112,7 +112,7 @@
     public byte[] blb;
     public java.util.ArrayList list;
 
-    public A1PK ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public A1PK ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         this.name = name;
         id1 = name;
@@ -123,7 +123,7 @@
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException { 
+    public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException { 
         blb = new byte[]{1,2};
         list = new java.util.ArrayList();
     }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Home.java
index d3fa871..9d3fa23 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A1Home.java
@@ -16,17 +16,17 @@
 
 package fieldtest;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1Home extends javax.ejb.EJBHome {
+public interface A1Home extends jakarta.ejb.EJBHome {
     
-    public  A1 findByPrimaryKey(A1PK pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A1 findByPrimaryKey(A1PK pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2.java
index eaa643c..ed5efe3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2.java
@@ -16,14 +16,14 @@
 
 package fieldtest;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2 extends javax.ejb.EJBObject {
+public interface A2 extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Bean.java
index 1626b63..ee959c8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Bean.java
@@ -16,7 +16,7 @@
 
 package fieldtest;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,54 +25,54 @@
  */
 
 
-public abstract class A2Bean implements javax.ejb.EntityBean {
+public abstract class A2Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A2Bean ejbRemove");
     }
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
     }
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
     }
@@ -109,7 +109,7 @@
     public abstract byte[] getBlb() ;
     public abstract void setBlb(byte[] b) ;
 
-    public A2PK ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public A2PK ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         long now = System.currentTimeMillis();
         setId1(name);
@@ -120,7 +120,7 @@
         return null;
     }
     
-    public void ejbPostCreate(java.lang.String name) throws javax.ejb.CreateException { 
+    public void ejbPostCreate(java.lang.String name) throws jakarta.ejb.CreateException { 
         setBlb(new byte[]{1,2});
         setList(new java.util.ArrayList());
     }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Home.java
index 9d95905..67602af 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/fieldtest/ejb/A2Home.java
@@ -16,17 +16,17 @@
 
 package fieldtest;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2Home extends javax.ejb.EJBHome {
+public interface A2Home extends jakarta.ejb.EJBHome {
     
-    public  A2 findByPrimaryKey(A2PK pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A2 findByPrimaryKey(A2PK pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/A.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/A.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/A.java
index d3da6a8..0ddc8d0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/A.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/A.java
@@ -16,14 +16,14 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A extends javax.ejb.EJBObject {
+public interface A extends jakarta.ejb.EJBObject {
  
     public String getLastname() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/ABean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/ABean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/ABean.java
index b97d97a..ff3bd24 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/ABean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/ABean.java
@@ -16,7 +16,7 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -24,21 +24,21 @@
  */
 
 
-public abstract class ABean implements javax.ejb.EntityBean {
+public abstract class ABean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -46,7 +46,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -54,7 +54,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: ABean ejbRemove");
@@ -62,7 +62,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -70,7 +70,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -78,7 +78,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -93,7 +93,7 @@
     public abstract double getSalary();
     public abstract void setSalary(double s);
 
-    public APK ejbCreate(long id, java.lang.String name, double s) throws javax.ejb.CreateException {
+    public APK ejbCreate(long id, java.lang.String name, double s) throws jakarta.ejb.CreateException {
 
         setId(id);
         setLastname(name);
@@ -103,6 +103,6 @@
     }
     
     public void ejbPostCreate(long id, java.lang.String name, double s)
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/AHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/AHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/AHome.java
index e01b878..a5961c8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/AHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/AHome.java
@@ -16,17 +16,17 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface AHome extends javax.ejb.EJBHome {
+public interface AHome extends jakarta.ejb.EJBHome {
     
-    public  A findByPrimaryKey(APK pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A findByPrimaryKey(APK pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A create(long i, java.lang.String name, double s) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A create(long i, java.lang.String name, double s) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/B.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/B.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/B.java
index bdf246c..ca9ad80 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/B.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/B.java
@@ -16,14 +16,14 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface B extends javax.ejb.EJBObject {
+public interface B extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BBean.java
index 374c38b..e142bc8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BBean.java
@@ -16,7 +16,7 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -24,21 +24,21 @@
  */
 
 
-public abstract class BBean implements javax.ejb.EntityBean {
+public abstract class BBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -46,7 +46,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -54,7 +54,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: BBean ejbRemove");
@@ -62,7 +62,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -70,7 +70,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -78,7 +78,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -90,7 +90,7 @@
     public abstract java.lang.String getName();
     public abstract void setName(java.lang.String name);
 
-    public java.sql.Date ejbCreate(java.sql.Date id, java.lang.String name) throws javax.ejb.CreateException {
+    public java.sql.Date ejbCreate(java.sql.Date id, java.lang.String name) throws jakarta.ejb.CreateException {
 
         setId(id);
         setName(name);
@@ -99,6 +99,6 @@
     }
     
     public void ejbPostCreate(java.sql.Date id, java.lang.String name)
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BHome.java
index e5f302b..fccd9d8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/BHome.java
@@ -16,17 +16,17 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface BHome extends javax.ejb.EJBHome {
+public interface BHome extends jakarta.ejb.EJBHome {
     
-    public  B findByPrimaryKey(java.sql.Date pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  B findByPrimaryKey(java.sql.Date pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  B create(java.sql.Date i, java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  B create(java.sql.Date i, java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/C.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/C.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/C.java
index 05a0d7b..ca59c0f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/C.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/C.java
@@ -16,14 +16,14 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface C extends javax.ejb.EJBObject {
+public interface C extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CBean.java
index 4462407..0f8410b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CBean.java
@@ -16,7 +16,7 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -24,21 +24,21 @@
  */
 
 
-public abstract class CBean implements javax.ejb.EntityBean {
+public abstract class CBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -46,7 +46,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -54,7 +54,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: CBean ejbRemove");
@@ -62,7 +62,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -70,7 +70,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -78,7 +78,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -90,7 +90,7 @@
     public abstract java.lang.String getName();
     public abstract void setName(java.lang.String name);
 
-    public CPK ejbCreate(long id, java.lang.String name) throws javax.ejb.CreateException {
+    public CPK ejbCreate(long id, java.lang.String name) throws jakarta.ejb.CreateException {
 
         setId(id);
         setName(name);
@@ -99,6 +99,6 @@
     }
     
     public void ejbPostCreate(long id, java.lang.String name)
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CHome.java
index b7fe766..abc207e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/inheritedpk/ejb/CHome.java
@@ -16,17 +16,17 @@
 
 package pkvalidation;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface CHome extends javax.ejb.EJBHome {
+public interface CHome extends jakarta.ejb.EJBHome {
     
-    public  C findByPrimaryKey(CPK pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  C findByPrimaryKey(CPK pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  C create(long i, java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  C create(long i, java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/Product.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/Product.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/Product.java
index c3a7f4c..1a31d0e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/Product.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/Product.java
@@ -16,7 +16,7 @@
 
 package j2eeguide.product;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Product extends EJBObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductEJB.java
index 9ceda1c..3958441 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductEJB.java
@@ -17,7 +17,7 @@
 package j2eeguide.product;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public class ProductEJB implements EntityBean {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductHome.java
index e44baea..2310489 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/j2eeguide_product/ejb/ProductHome.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface ProductHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LineItemBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LineItemBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LineItemBean.java
index 0c3f10e..da6347c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LineItemBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LineItemBean.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class LineItemBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItem.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItem.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItem.java
index f1a4b90..8602a33 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItem.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItem.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalLineItem extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItemHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItemHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItemHome.java
index 51397a5..cfaf28a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItemHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalLineItemHome.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalLineItemHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrder.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrder.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrder.java
index 82f123d..9fd207c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrder.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrder.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalOrder extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrderHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrderHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrderHome.java
index d904afc..f658e3e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrderHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalOrderHome.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalOrderHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPart.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPart.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPart.java
index 35e3f85..1c24e40 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPart.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPart.java
@@ -17,7 +17,7 @@
 package dataregistry;
 
 import java.util.Collection;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalPart extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPartHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPartHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPartHome.java
index bfc3dc0..3a2ca4e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPartHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalPartHome.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalPartHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendor.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendor.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendor.java
index ae0c18c..e90fb9c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendor.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendor.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendor extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorHome.java
index 475b0da..a6125bf 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorHome.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendorHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPart.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPart.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPart.java
index 6cd8c16..b1f74ff 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPart.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPart.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendorPart extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPartHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPartHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPartHome.java
index 3e38aef..b3640da 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPartHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/LocalVendorPartHome.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendorPartHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/OrderBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/OrderBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/OrderBean.java
index 038f42f..8390038 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/OrderBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/OrderBean.java
@@ -20,7 +20,7 @@
 import java.util.Date;
 import java.util.Iterator;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class OrderBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/PartBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/PartBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/PartBean.java
index dc0a56f..30960f2 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/PartBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/PartBean.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class PartBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorBean.java
index 9dc1443..5cce12e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorBean.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class VendorBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorPartBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorPartBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorPartBean.java
index 5b64640..d7de1d8 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorPartBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/dataregistry/VendorPartBean.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class VendorPartBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/Request.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/Request.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/Request.java
index c11b937..0ba131c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/Request.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/Request.java
@@ -19,7 +19,7 @@
 import java.rmi.RemoteException;
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface Request extends EJBObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestBean.java
index ac63fa8..aebd6e6 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestBean.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import dataregistry.*;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestHome.java
index 866589d..5bdf34f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/orderapp/ejb/request/RequestHome.java
@@ -17,7 +17,7 @@
 package request;
 
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface RequestHome extends EJBHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalParts.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalParts.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalParts.java
index 0df1542..346b6ee 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalParts.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalParts.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 16, 2002 1:22:14 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface LocalParts extends javax.ejb.EJBLocalObject {
+public interface LocalParts extends jakarta.ejb.EJBLocalObject {
     
     public void addSupplier(Data.LocalSuppliers supplier);
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalPartsHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalPartsHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalPartsHome.java
index 65063b6..f434191 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalPartsHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalPartsHome.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 16, 2002 1:22:14 PM
@@ -24,15 +24,15 @@
  * @author mvatkina
  */
 
-public interface LocalPartsHome extends javax.ejb.EJBLocalHome {
+public interface LocalPartsHome extends jakarta.ejb.EJBLocalHome {
     
     public Data.LocalParts findByPrimaryKey(java.lang.Integer aKey)
-    throws javax.ejb.FinderException;
+    throws jakarta.ejb.FinderException;
     
-    public LocalParts create(java.lang.Integer partid, java.lang.String name, java.lang.String color, java.math.BigDecimal weight, java.lang.Double price) throws javax.ejb.CreateException;
+    public LocalParts create(java.lang.Integer partid, java.lang.String name, java.lang.String color, java.math.BigDecimal weight, java.lang.Double price) throws jakarta.ejb.CreateException;
     
-    public java.util.Collection findAll() throws javax.ejb.FinderException;
+    public java.util.Collection findAll() throws jakarta.ejb.FinderException;
     
-    public java.util.Collection findByPartsName(java.lang.String name) throws javax.ejb.FinderException;
+    public java.util.Collection findByPartsName(java.lang.String name) throws jakarta.ejb.FinderException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliers.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliers.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliers.java
index 473fc37..25feb85 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliers.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliers.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 16, 2002 1:22:07 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface LocalSuppliers extends javax.ejb.EJBLocalObject {
+public interface LocalSuppliers extends jakarta.ejb.EJBLocalObject {
     
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliersHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliersHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliersHome.java
index 65abafc..9f23669 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliersHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/LocalSuppliersHome.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 16, 2002 1:22:07 PM
@@ -24,13 +24,13 @@
  * @author mvatkina
  */
 
-public interface LocalSuppliersHome extends javax.ejb.EJBLocalHome {
+public interface LocalSuppliersHome extends jakarta.ejb.EJBLocalHome {
     
     public Data.LocalSuppliers findByPrimaryKey(Data.SuppliersKey aKey)
-    throws javax.ejb.FinderException;
+    throws jakarta.ejb.FinderException;
     
-    public LocalSuppliers create(java.lang.Integer partid, java.lang.Integer supplierid, java.lang.String name, int status, java.lang.String city) throws javax.ejb.CreateException;
+    public LocalSuppliers create(java.lang.Integer partid, java.lang.Integer supplierid, java.lang.String name, int status, java.lang.String city) throws jakarta.ejb.CreateException;
     
-    public java.util.Collection findAll() throws javax.ejb.FinderException;
+    public java.util.Collection findAll() throws jakarta.ejb.FinderException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/PartsBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/PartsBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/PartsBean.java
index b47afc0..7ccdbfc 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/PartsBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/PartsBean.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*; 
 
 /**
@@ -26,21 +26,21 @@
  */
 
 
-public abstract class PartsBean implements javax.ejb.EntityBean {
+public abstract class PartsBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -48,7 +48,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -56,7 +56,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         
@@ -64,7 +64,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -72,7 +72,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -80,7 +80,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -105,9 +105,9 @@
     
     public abstract void setSuppliers(java.util.Collection suppliers);
     
-    public java.lang.Integer ejbCreate(java.lang.Integer partid, java.lang.String name, java.lang.String color, java.math.BigDecimal weight, java.lang.Double price) throws javax.ejb.CreateException {
+    public java.lang.Integer ejbCreate(java.lang.Integer partid, java.lang.String name, java.lang.String color, java.math.BigDecimal weight, java.lang.Double price) throws jakarta.ejb.CreateException {
         if (partid == null) {
-            throw new javax.ejb.CreateException("The partid is required.");
+            throw new jakarta.ejb.CreateException("The partid is required.");
         }
         setPartid(partid);
         setName(name);
@@ -118,7 +118,7 @@
         return null;
     }
     
-    public void ejbPostCreate(java.lang.Integer partid, java.lang.String name, java.lang.String color, java.math.BigDecimal weight, java.lang.Double price) throws javax.ejb.CreateException {
+    public void ejbPostCreate(java.lang.Integer partid, java.lang.String name, java.lang.String color, java.math.BigDecimal weight, java.lang.Double price) throws jakarta.ejb.CreateException {
         
     }
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSession.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSession.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSession.java
index c588109..cd907cc 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSession.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSession.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 16, 2002 2:08:21 PM
@@ -24,7 +24,7 @@
  * @author mvatkina
  */
 
-public interface SPSession extends javax.ejb.EJBObject {
+public interface SPSession extends jakarta.ejb.EJBObject {
     
     public int checkAllParts() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionBean.java
index c56c206..2a891da 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionBean.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*; 
 
 
@@ -27,22 +27,22 @@
  */
 
 
-public class SPSessionBean implements javax.ejb.SessionBean {
-    private javax.ejb.SessionContext context;
+public class SPSessionBean implements jakarta.ejb.SessionBean {
+    private jakarta.ejb.SessionContext context;
     private LocalSuppliersHome suppliersHome = null;
     private LocalPartsHome partsHome = null;
     
     
     /**
-     * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext)
+     * @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
      */
-    public void setSessionContext(javax.ejb.SessionContext aContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.SessionBean#ejbActivate()
+     * @see jakarta.ejb.SessionBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -50,7 +50,7 @@
     
     
     /**
-     * @see javax.ejb.SessionBean#ejbPassivate()
+     * @see jakarta.ejb.SessionBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -58,7 +58,7 @@
     
     
     /**
-     * @see javax.ejb.SessionBean#ejbRemove()
+     * @see jakarta.ejb.SessionBean#ejbRemove()
      */
     public void ejbRemove() {
         

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionHome.java
index 1fbd4bc..a480d81 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SPSessionHome.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 16, 2002 2:08:21 PM
@@ -24,9 +24,9 @@
  * @author mvatkina
  */
 
-public interface SPSessionHome extends javax.ejb.EJBHome {
+public interface SPSessionHome extends jakarta.ejb.EJBHome {
     
     public Data.SPSession create()
-    throws javax.ejb.CreateException, java.rmi.RemoteException;
+    throws jakarta.ejb.CreateException, java.rmi.RemoteException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SuppliersBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SuppliersBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SuppliersBean.java
index 7704fa1..feae3b3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SuppliersBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/partSupplier/ejb/SuppliersBean.java
@@ -16,7 +16,7 @@
 
 package Data;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Dec 16, 2002 1:22:07 PM
@@ -25,22 +25,22 @@
  */
 
 
-public abstract class SuppliersBean implements javax.ejb.EntityBean {
+public abstract class SuppliersBean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     private LocalParts part0;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -48,7 +48,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -56,7 +56,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         Data.LocalParts part = getParts();
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -87,7 +87,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -112,9 +112,9 @@
     
     public abstract void setParts(Data.LocalParts parts);
     
-    public Data.SuppliersKey ejbCreate(java.lang.Integer partid, java.lang.Integer supplierid, java.lang.String name, int status, java.lang.String city) throws javax.ejb.CreateException {
+    public Data.SuppliersKey ejbCreate(java.lang.Integer partid, java.lang.Integer supplierid, java.lang.String name, int status, java.lang.String city) throws jakarta.ejb.CreateException {
         if ((supplierid == null) ||(partid == null)){
-            throw new javax.ejb.CreateException("The partid and supplierid are required.");
+            throw new jakarta.ejb.CreateException("The partid and supplierid are required.");
         }
         setPartid(partid);
         setSupplierid(supplierid);
@@ -124,7 +124,7 @@
         return null;
     }
     
-    public void ejbPostCreate(java.lang.Integer partid, java.lang.Integer supplierid, java.lang.String name, int status, java.lang.String city) throws javax.ejb.CreateException {
+    public void ejbPostCreate(java.lang.Integer partid, java.lang.Integer supplierid, java.lang.String name, int status, java.lang.String city) throws jakarta.ejb.CreateException {
         part0 = getParts();
     }
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/client/Client.java
index 5f1f705..7863f99 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/client/Client.java
@@ -23,7 +23,7 @@
 import java.util.*;
 
 import javax.naming.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1.java
index df2f407..4d863be 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1 extends javax.ejb.EJBObject {
+public interface A1 extends jakarta.ejb.EJBObject {
 
     public String getShortName() throws RemoteException; 
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Bean.java
index e2d9b8f..ee18fa2 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Bean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * 1.1 Bean that is deployed as a read-only bean

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Home.java
index 5bc87e0..fec3c00 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A1Home.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1Home extends javax.ejb.EJBHome {
+public interface A1Home extends jakarta.ejb.EJBHome {
 
     public A1 findByPrimaryKey(java.lang.String pk)  
             throws FinderException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2.java
index 97fed8b..ecd6558 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2 extends javax.ejb.EJBObject {
+public interface A2 extends jakarta.ejb.EJBObject {
 
     public String getShortName() throws RemoteException;
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Bean.java
index c6e7ce3..058a98e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Bean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * 2.0 Bean that is deployed as a read-only bean

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Home.java
index b4a90f7..7d08314 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/A2Home.java
@@ -16,14 +16,14 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2Home extends javax.ejb.EJBHome {
+public interface A2Home extends jakarta.ejb.EJBHome {
 
     public A2 findByPrimaryKey(java.lang.String pk)  
             throws FinderException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/Test.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/Test.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/Test.java
index 6f6b539..6f58d3a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/Test.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/Test.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface Test extends EJBObject {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestBean.java
index ec0e0c3..dde264c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestBean.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.sql.DataSource;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestHome.java
index 745516c..4995503 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/robeans/ejb/TestHome.java
@@ -16,7 +16,7 @@
 
 package test;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.*;
 
 public interface TestHome extends EJBHome {

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-roster.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-roster.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-roster.xml
index fac24dd..50f10a6 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-roster.xml
@@ -346,7 +346,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -354,7 +354,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team.xml
index d59a0d4..848b1ac 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team.xml
@@ -566,7 +566,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>
@@ -599,7 +599,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -607,7 +607,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -842,7 +842,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>
@@ -1032,7 +1032,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -1045,7 +1045,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team2.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team2.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team2.xml
index 715f43f..e48ecd4 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team2.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/descriptor/ejb-jar-team2.xml
@@ -566,7 +566,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>
@@ -599,7 +599,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -607,7 +607,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>
@@ -842,7 +842,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>
@@ -1032,7 +1032,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -1045,7 +1045,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/Roster.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/Roster.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/Roster.java
index ecbb11f..692a185 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/Roster.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/Roster.java
@@ -18,9 +18,9 @@
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
-import javax.ejb.FinderException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBObject;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.RemoveException;
 import util.LeagueDetails;
 import util.PlayerDetails;
 import util.TeamDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterBean.java
index b56aff0..386979b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterBean.java
@@ -17,8 +17,8 @@
 package roster;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.*;
 import team.*;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterHome.java
index 6dfcc41..cecd462 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/roster/RosterHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface RosterHome extends EJBHome {
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/League.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/League.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/League.java
index caa955e..b0b8e1b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/League.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/League.java
@@ -19,10 +19,10 @@
 import java.util.Collection;
 import java.rmi.RemoteException;
 import java.util.Set;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 
-public interface League extends  javax.ejb.EJBObject   {
+public interface League extends  jakarta.ejb.EJBObject   {
 
     public String getLeagueId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueBean.java
index d9f348a..38d3806 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueHome.java
index e8809e2..22a734a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LeagueHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface LeagueHome extends  javax.ejb.EJBHome   {
+public interface LeagueHome extends  jakarta.ejb.EJBHome   {
 
     public League create (String id, String name, String sport)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeague.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeague.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeague.java
index 3f93dd5..f2eb046 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeague.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeague.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeagueHome.java
index c467a5e..ec176da 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayer.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayer.java
index e8846dc..bc0d1b0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayer.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayerHome.java
index d858503..90458e3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeam.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeam.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeam.java
index f8ad6c9..914a4cb 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeam.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeam.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeamHome.java
index ac2f66c..884657e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/LocalTeamHome.java
@@ -17,9 +17,9 @@
 package team;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.FinderException;
 
 public interface LocalTeamHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Player.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Player.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Player.java
index a35d838..1db514f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Player.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Player.java
@@ -18,9 +18,9 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface Player extends  javax.ejb.EJBObject   {
+public interface Player extends  jakarta.ejb.EJBObject   {
 
     public String getPlayerId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerBean.java
index 2e2d79a..44b0a8e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerHome.java
index 1608787..ded9724 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/PlayerHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface PlayerHome extends  javax.ejb.EJBHome   {
+public interface PlayerHome extends  jakarta.ejb.EJBHome   {
 
     public Player create (String id, String name, String position,
         double salary)

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Team.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Team.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Team.java
index 8935cf1..9452118 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Team.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/Team.java
@@ -20,7 +20,7 @@
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 
-public interface Team extends  javax.ejb.EJBObject   {
+public interface Team extends  jakarta.ejb.EJBObject   {
 
     public String getTeamId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamBean.java
index 4f6e907..74fa4d7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 import util.PlayerDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamHome.java
index 6ac99d5..fe13044 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/roster2Teams/ejb/team/TeamHome.java
@@ -18,10 +18,10 @@
 
 import java.rmi.RemoteException;
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface TeamHome extends  javax.ejb.EJBHome   {
+public interface TeamHome extends  jakarta.ejb.EJBHome   {
 
     public Team create (String id, String name, String city)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-roster.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-roster.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-roster.xml
index 84f24b2..ed0b029 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-roster.xml
@@ -231,7 +231,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -332,7 +332,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-team.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-team.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-team.xml
index 03099f4..704c802 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/descriptor/ejb-jar-team.xml
@@ -624,7 +624,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -731,7 +731,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -819,7 +819,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/Roster.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/Roster.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/Roster.java
index ecbb11f..692a185 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/Roster.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/Roster.java
@@ -18,9 +18,9 @@
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
-import javax.ejb.FinderException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBObject;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.RemoveException;
 import util.LeagueDetails;
 import util.PlayerDetails;
 import util.TeamDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterBean.java
index b56aff0..386979b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterBean.java
@@ -17,8 +17,8 @@
 package roster;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.*;
 import team.*;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterHome.java
index 6dfcc41..cecd462 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/roster/RosterHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface RosterHome extends EJBHome {
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/League.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/League.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/League.java
index caa955e..b0b8e1b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/League.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/League.java
@@ -19,10 +19,10 @@
 import java.util.Collection;
 import java.rmi.RemoteException;
 import java.util.Set;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 
-public interface League extends  javax.ejb.EJBObject   {
+public interface League extends  jakarta.ejb.EJBObject   {
 
     public String getLeagueId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueBean.java
index d9f348a..38d3806 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueHome.java
index e8809e2..22a734a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LeagueHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface LeagueHome extends  javax.ejb.EJBHome   {
+public interface LeagueHome extends  jakarta.ejb.EJBHome   {
 
     public League create (String id, String name, String sport)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeague.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeague.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeague.java
index 3f93dd5..f2eb046 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeague.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeague.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeagueHome.java
index c467a5e..ec176da 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayer.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayer.java
index e8846dc..bc0d1b0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayer.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayerHome.java
index d858503..90458e3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeam.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeam.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeam.java
index f8ad6c9..914a4cb 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeam.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeam.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeamHome.java
index ac2f66c..884657e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/LocalTeamHome.java
@@ -17,9 +17,9 @@
 package team;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.FinderException;
 
 public interface LocalTeamHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Player.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Player.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Player.java
index a35d838..1db514f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Player.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Player.java
@@ -18,9 +18,9 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface Player extends  javax.ejb.EJBObject   {
+public interface Player extends  jakarta.ejb.EJBObject   {
 
     public String getPlayerId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerBean.java
index 2e2d79a..44b0a8e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerHome.java
index 1608787..ded9724 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/PlayerHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface PlayerHome extends  javax.ejb.EJBHome   {
+public interface PlayerHome extends  jakarta.ejb.EJBHome   {
 
     public Player create (String id, String name, String position,
         double salary)

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Team.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Team.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Team.java
index 8935cf1..9452118 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Team.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/Team.java
@@ -20,7 +20,7 @@
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 
-public interface Team extends  javax.ejb.EJBObject   {
+public interface Team extends  jakarta.ejb.EJBObject   {
 
     public String getTeamId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamBean.java
index 4f6e907..74fa4d7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 import util.PlayerDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamHome.java
index 6ac99d5..fe13044 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterGenDBSchema/ejb/team/TeamHome.java
@@ -18,10 +18,10 @@
 
 import java.rmi.RemoteException;
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface TeamHome extends  javax.ejb.EJBHome   {
+public interface TeamHome extends  jakarta.ejb.EJBHome   {
 
     public Team create (String id, String name, String city)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-roster.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-roster.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-roster.xml
index 84f24b2..ed0b029 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-roster.xml
@@ -231,7 +231,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -332,7 +332,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-team.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-team.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-team.xml
index 03099f4..704c802 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/descriptor/ejb-jar-team.xml
@@ -624,7 +624,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -731,7 +731,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -819,7 +819,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/Roster.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/Roster.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/Roster.java
index ecbb11f..692a185 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/Roster.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/Roster.java
@@ -18,9 +18,9 @@
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
-import javax.ejb.FinderException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBObject;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.RemoveException;
 import util.LeagueDetails;
 import util.PlayerDetails;
 import util.TeamDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterBean.java
index b56aff0..386979b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterBean.java
@@ -17,8 +17,8 @@
 package roster;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.*;
 import team.*;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterHome.java
index 6dfcc41..cecd462 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/roster/RosterHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface RosterHome extends EJBHome {
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/League.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/League.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/League.java
index caa955e..b0b8e1b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/League.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/League.java
@@ -19,10 +19,10 @@
 import java.util.Collection;
 import java.rmi.RemoteException;
 import java.util.Set;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 
-public interface League extends  javax.ejb.EJBObject   {
+public interface League extends  jakarta.ejb.EJBObject   {
 
     public String getLeagueId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueBean.java
index d9f348a..38d3806 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueHome.java
index e8809e2..22a734a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LeagueHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface LeagueHome extends  javax.ejb.EJBHome   {
+public interface LeagueHome extends  jakarta.ejb.EJBHome   {
 
     public League create (String id, String name, String sport)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeague.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeague.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeague.java
index 3f93dd5..f2eb046 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeague.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeague.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeagueHome.java
index c467a5e..ec176da 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayer.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayer.java
index e8846dc..bc0d1b0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayer.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayerHome.java
index d858503..90458e3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeam.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeam.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeam.java
index f8ad6c9..914a4cb 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeam.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeam.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeamHome.java
index ac2f66c..884657e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/LocalTeamHome.java
@@ -17,9 +17,9 @@
 package team;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.FinderException;
 
 public interface LocalTeamHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Player.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Player.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Player.java
index a35d838..1db514f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Player.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Player.java
@@ -18,9 +18,9 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface Player extends  javax.ejb.EJBObject   {
+public interface Player extends  jakarta.ejb.EJBObject   {
 
     public String getPlayerId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerBean.java
index 2e2d79a..44b0a8e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerHome.java
index 1608787..ded9724 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/PlayerHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface PlayerHome extends  javax.ejb.EJBHome   {
+public interface PlayerHome extends  jakarta.ejb.EJBHome   {
 
     public Player create (String id, String name, String position,
         double salary)

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Team.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Team.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Team.java
index 8935cf1..9452118 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Team.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/Team.java
@@ -20,7 +20,7 @@
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 
-public interface Team extends  javax.ejb.EJBObject   {
+public interface Team extends  jakarta.ejb.EJBObject   {
 
     public String getTeamId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamBean.java
index 4f6e907..74fa4d7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 import util.PlayerDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamHome.java
index 6ac99d5..fe13044 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterJava2DB/ejb/team/TeamHome.java
@@ -18,10 +18,10 @@
 
 import java.rmi.RemoteException;
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface TeamHome extends  javax.ejb.EJBHome   {
+public interface TeamHome extends  jakarta.ejb.EJBHome   {
 
     public Team create (String id, String name, String city)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-roster.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-roster.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-roster.xml
index 84f24b2..ed0b029 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-roster.xml
@@ -231,7 +231,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -332,7 +332,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-team.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-team.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-team.xml
index 03099f4..704c802 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/descriptor/ejb-jar-team.xml
@@ -624,7 +624,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -731,7 +731,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -819,7 +819,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/Roster.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/Roster.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/Roster.java
index ecbb11f..692a185 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/Roster.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/Roster.java
@@ -18,9 +18,9 @@
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
-import javax.ejb.FinderException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBObject;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.RemoveException;
 import util.LeagueDetails;
 import util.PlayerDetails;
 import util.TeamDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterBean.java
index b56aff0..386979b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterBean.java
@@ -17,8 +17,8 @@
 package roster;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.*;
 import team.*;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterHome.java
index 6dfcc41..cecd462 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/roster/RosterHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface RosterHome extends EJBHome {
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/League.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/League.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/League.java
index caa955e..b0b8e1b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/League.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/League.java
@@ -19,10 +19,10 @@
 import java.util.Collection;
 import java.rmi.RemoteException;
 import java.util.Set;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 
-public interface League extends  javax.ejb.EJBObject   {
+public interface League extends  jakarta.ejb.EJBObject   {
 
     public String getLeagueId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueBean.java
index d9f348a..38d3806 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueHome.java
index e8809e2..22a734a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LeagueHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface LeagueHome extends  javax.ejb.EJBHome   {
+public interface LeagueHome extends  jakarta.ejb.EJBHome   {
 
     public League create (String id, String name, String sport)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeague.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeague.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeague.java
index 3f93dd5..f2eb046 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeague.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeague.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeagueHome.java
index c467a5e..ec176da 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayer.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayer.java
index e8846dc..bc0d1b0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayer.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayerHome.java
index d858503..90458e3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeam.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeam.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeam.java
index f8ad6c9..914a4cb 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeam.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeam.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeamHome.java
index ac2f66c..884657e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/LocalTeamHome.java
@@ -17,9 +17,9 @@
 package team;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.FinderException;
 
 public interface LocalTeamHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Player.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Player.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Player.java
index a35d838..1db514f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Player.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Player.java
@@ -18,9 +18,9 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface Player extends  javax.ejb.EJBObject   {
+public interface Player extends  jakarta.ejb.EJBObject   {
 
     public String getPlayerId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerBean.java
index 2e2d79a..44b0a8e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerHome.java
index 1608787..ded9724 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/PlayerHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface PlayerHome extends  javax.ejb.EJBHome   {
+public interface PlayerHome extends  jakarta.ejb.EJBHome   {
 
     public Player create (String id, String name, String position,
         double salary)

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Team.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Team.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Team.java
index 8935cf1..9452118 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Team.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/Team.java
@@ -20,7 +20,7 @@
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 
-public interface Team extends  javax.ejb.EJBObject   {
+public interface Team extends  jakarta.ejb.EJBObject   {
 
     public String getTeamId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamBean.java
index 4f6e907..74fa4d7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 import util.PlayerDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamHome.java
index 6ac99d5..fe13044 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterVC/ejb/team/TeamHome.java
@@ -18,10 +18,10 @@
 
 import java.rmi.RemoteException;
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface TeamHome extends  javax.ejb.EJBHome   {
+public interface TeamHome extends  jakarta.ejb.EJBHome   {
 
     public Team create (String id, String name, String city)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-roster.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-roster.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-roster.xml
index 84f24b2..ed0b029 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-roster.xml
@@ -231,7 +231,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -332,7 +332,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-team.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-team.xml b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-team.xml
index 03099f4..704c802 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/descriptor/ejb-jar-team.xml
@@ -624,7 +624,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -731,7 +731,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -819,7 +819,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/Roster.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/Roster.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/Roster.java
index ecbb11f..692a185 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/Roster.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/Roster.java
@@ -18,9 +18,9 @@
 
 import java.rmi.RemoteException;
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
-import javax.ejb.FinderException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.EJBObject;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.RemoveException;
 import util.LeagueDetails;
 import util.PlayerDetails;
 import util.TeamDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterBean.java
index b56aff0..386979b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterBean.java
@@ -17,8 +17,8 @@
 package roster;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.*;
 import team.*;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterHome.java
index 6dfcc41..cecd462 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/roster/RosterHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface RosterHome extends EJBHome {
  

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/League.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/League.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/League.java
index caa955e..b0b8e1b 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/League.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/League.java
@@ -19,10 +19,10 @@
 import java.util.Collection;
 import java.rmi.RemoteException;
 import java.util.Set;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
 
-public interface League extends  javax.ejb.EJBObject   {
+public interface League extends  jakarta.ejb.EJBObject   {
 
     public String getLeagueId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueBean.java
index d9f348a..38d3806 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueHome.java
index e8809e2..22a734a 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LeagueHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface LeagueHome extends  javax.ejb.EJBHome   {
+public interface LeagueHome extends  jakarta.ejb.EJBHome   {
 
     public League create (String id, String name, String sport)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeague.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeague.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeague.java
index 3f93dd5..f2eb046 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeague.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeague.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeagueHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeagueHome.java
index c467a5e..ec176da 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayer.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayer.java
index e8846dc..bc0d1b0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayer.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayerHome.java
index d858503..90458e3 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeam.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeam.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeam.java
index f8ad6c9..914a4cb 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeam.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeam.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeamHome.java
index ac2f66c..884657e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/LocalTeamHome.java
@@ -17,9 +17,9 @@
 package team;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
+import jakarta.ejb.FinderException;
 
 public interface LocalTeamHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Player.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Player.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Player.java
index a35d838..1db514f 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Player.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Player.java
@@ -18,9 +18,9 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface Player extends  javax.ejb.EJBObject   {
+public interface Player extends  jakarta.ejb.EJBObject   {
 
     public String getPlayerId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerBean.java
index 2e2d79a..44b0a8e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerHome.java
index 1608787..ded9724 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/PlayerHome.java
@@ -18,10 +18,10 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface PlayerHome extends  javax.ejb.EJBHome   {
+public interface PlayerHome extends  jakarta.ejb.EJBHome   {
 
     public Player create (String id, String name, String position,
         double salary)

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Team.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Team.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Team.java
index 8935cf1..9452118 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Team.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/Team.java
@@ -20,7 +20,7 @@
 import java.rmi.RemoteException;
 import java.util.ArrayList;
 
-public interface Team extends  javax.ejb.EJBObject   {
+public interface Team extends  jakarta.ejb.EJBObject   {
 
     public String getTeamId() throws RemoteException;
     public String getName() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamBean.java
index 4f6e907..74fa4d7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamBean.java
@@ -17,7 +17,7 @@
 package team;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import util.Debug;
 import util.PlayerDetails;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamHome.java
index 6ac99d5..fe13044 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/rosterext/ejb/team/TeamHome.java
@@ -18,10 +18,10 @@
 
 import java.rmi.RemoteException;
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
-public interface TeamHome extends  javax.ejb.EJBHome   {
+public interface TeamHome extends  jakarta.ejb.EJBHome   {
 
     public Team create (String id, String name, String city)
         throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1.java
index 99508d9..a4953e7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1.java
@@ -16,14 +16,14 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1 extends javax.ejb.EJBObject {
+public interface A1 extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Bean.java
index f65f047..9e8e51e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Bean.java
@@ -16,7 +16,7 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public class A1Bean implements javax.ejb.EntityBean {
+public class A1Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A1Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -91,7 +91,7 @@
 
     public java.lang.String name;
 
-    public Object ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public Object ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         this.name = name;
 
@@ -99,6 +99,6 @@
     }
     
     public void ejbPostCreate(java.lang.String name)
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Home.java
index e624b21..c014517 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A1Home.java
@@ -16,17 +16,17 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1Home extends javax.ejb.EJBHome {
+public interface A1Home extends jakarta.ejb.EJBHome {
     
-    public  A1 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A1 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2.java
index 55f1c4e..6341b97 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2.java
@@ -16,14 +16,14 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2 extends javax.ejb.EJBObject {
+public interface A2 extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Bean.java
index e2448c9..d97940c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Bean.java
@@ -16,7 +16,7 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public abstract class A2Bean implements javax.ejb.EntityBean {
+public abstract class A2Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A2Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -88,7 +88,7 @@
     public abstract java.lang.String getName();
     public abstract void setName(java.lang.String name);
 
-    public Object ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public Object ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         setName(name);
 
@@ -96,6 +96,6 @@
     }
     
     public void ejbPostCreate(java.lang.String name)
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Home.java
index 43bf7a1..47cbe96 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpk/ejb/A2Home.java
@@ -16,17 +16,17 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2Home extends javax.ejb.EJBHome {
+public interface A2Home extends jakarta.ejb.EJBHome {
     
-    public  A2 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A2 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1.java
index 99508d9..a4953e7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1.java
@@ -16,14 +16,14 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1 extends javax.ejb.EJBObject {
+public interface A1 extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Bean.java
index f65f047..9e8e51e 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Bean.java
@@ -16,7 +16,7 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public class A1Bean implements javax.ejb.EntityBean {
+public class A1Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A1Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -91,7 +91,7 @@
 
     public java.lang.String name;
 
-    public Object ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public Object ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         this.name = name;
 
@@ -99,6 +99,6 @@
     }
     
     public void ejbPostCreate(java.lang.String name)
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Home.java
index e624b21..c014517 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A1Home.java
@@ -16,17 +16,17 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A1Home extends javax.ejb.EJBHome {
+public interface A1Home extends jakarta.ejb.EJBHome {
     
-    public  A1 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A1 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A1 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2.java
index 55f1c4e..6341b97 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2.java
@@ -16,14 +16,14 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2 extends javax.ejb.EJBObject {
+public interface A2 extends jakarta.ejb.EJBObject {
  
     public String getName() throws java.rmi.RemoteException;
     

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Bean.java
index e2448c9..d97940c 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Bean.java
@@ -16,7 +16,7 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 /**
@@ -25,21 +25,21 @@
  */
 
 
-public abstract class A2Bean implements javax.ejb.EntityBean {
+public abstract class A2Bean implements jakarta.ejb.EntityBean {
     
-    private javax.ejb.EntityContext context;
+    private jakarta.ejb.EntityContext context;
     
     
     /**
-     * @see javax.ejb.EntityBean#setEntityContext(javax.ejb.EntityContext)
+     * @see jakarta.ejb.EntityBean#setEntityContext(jakarta.ejb.EntityContext)
      */
-    public void setEntityContext(javax.ejb.EntityContext aContext) {
+    public void setEntityContext(jakarta.ejb.EntityContext aContext) {
         context=aContext;
     }
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbActivate()
+     * @see jakarta.ejb.EntityBean#ejbActivate()
      */
     public void ejbActivate() {
         
@@ -47,7 +47,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbPassivate()
+     * @see jakarta.ejb.EntityBean#ejbPassivate()
      */
     public void ejbPassivate() {
         
@@ -55,7 +55,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbRemove()
+     * @see jakarta.ejb.EntityBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("Debug: A2Bean ejbRemove");
@@ -63,7 +63,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#unsetEntityContext()
+     * @see jakarta.ejb.EntityBean#unsetEntityContext()
      */
     public void unsetEntityContext() {
         context=null;
@@ -71,7 +71,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbLoad()
+     * @see jakarta.ejb.EntityBean#ejbLoad()
      */
     public void ejbLoad() {
         
@@ -79,7 +79,7 @@
     
     
     /**
-     * @see javax.ejb.EntityBean#ejbStore()
+     * @see jakarta.ejb.EntityBean#ejbStore()
      */
     public void ejbStore() {
         
@@ -88,7 +88,7 @@
     public abstract java.lang.String getName();
     public abstract void setName(java.lang.String name);
 
-    public Object ejbCreate(java.lang.String name) throws javax.ejb.CreateException {
+    public Object ejbCreate(java.lang.String name) throws jakarta.ejb.CreateException {
 
         setName(name);
 
@@ -96,6 +96,6 @@
     }
     
     public void ejbPostCreate(java.lang.String name)
-        throws javax.ejb.CreateException { }
+        throws jakarta.ejb.CreateException { }
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Home.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Home.java b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Home.java
index 43bf7a1..47cbe96 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Home.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/cmp/unknownpkVC/ejb/A2Home.java
@@ -16,17 +16,17 @@
 
 package unknownpk;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.util.*;
 
 /**
  * @author mvatkina
  */
 
-public interface A2Home extends javax.ejb.EJBHome {
+public interface A2Home extends jakarta.ejb.EJBHome {
     
-    public  A2 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, javax.ejb.FinderException;
+    public  A2 findByPrimaryKey(Object pk)  throws java.rmi.RemoteException, jakarta.ejb.FinderException;
     
-    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public  A2 create(java.lang.String name) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/samples/SOAPtoJMSMessageSampleClient/simple-client/src/java/samples/jms/soaptojms/ServiceLocator.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/samples/SOAPtoJMSMessageSampleClient/simple-client/src/java/samples/jms/soaptojms/ServiceLocator.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/samples/SOAPtoJMSMessageSampleClient/simple-client/src/java/samples/jms/soaptojms/ServiceLocator.java
index 19793ec..a7cb7a2 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/samples/SOAPtoJMSMessageSampleClient/simple-client/src/java/samples/jms/soaptojms/ServiceLocator.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/mbeanapi/deployment/com/sun/enterprise/admin/mbeanapi/deployment/samples/SOAPtoJMSMessageSampleClient/simple-client/src/java/samples/jms/soaptojms/ServiceLocator.java
@@ -13,8 +13,8 @@
 
 import java.net.URL;
 
-import javax.ejb.EJBHome;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.EJBLocalHome;
 import jakarta.jms.QueueConnectionFactory;
 import jakarta.jms.Queue;
 import jakarta.jms.TopicConnectionFactory;

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupBean.java
index c9fbc1d..818365f 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupBean.java
@@ -18,9 +18,9 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import java.math.*;
 import javax.naming.*;
 

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemote.java
index e9b5b2e..9e71d85 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.devtest.admin.notification.lookup.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemoteHome.java
index d6caede..31c55b8 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/notification/lookup/ejb/LookupRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  */

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/client/Client.java
index 915035d..48a517f 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.Properties;
 

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/Synchronization.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/Synchronization.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/Synchronization.java
index ff836e0..2a1e6ea 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/Synchronization.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/Synchronization.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.admin.ee.synchronization.api.client;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.io.IOException;
 import com.sun.enterprise.ee.synchronization.SynchronizationException;

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationEJB.java
index a833a42..2d4a13c 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.admin.ee.synchronization.api.client;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.*;

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationHome.java
index 0dacfb5..e72c8ba 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/client/ejb/SynchronizationHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.admin.ee.synchronization.api.client;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SynchronizationHome
     extends EJBHome

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/client/Client.java
index 0b14db2..7cea5de 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.Properties;
 

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/Synchronization.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/Synchronization.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/Synchronization.java
index 2484882..173435b 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/Synchronization.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/Synchronization.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.admin.ee.synchronization.api.deployment;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import java.io.IOException;
 import com.sun.enterprise.ee.synchronization.SynchronizationException;

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationEJB.java
index 80fbdb4..4435192 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.admin.ee.synchronization.api.deployment;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.*;

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationHome.java
index c03e6ac..97feae2 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/deployment/ejb/SynchronizationHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.admin.ee.synchronization.api.deployment;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface SynchronizationHome
     extends EJBHome

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/client/RpaClient.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/client/RpaClient.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/client/RpaClient.java
index be225db..69b8fc7 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/client/RpaClient.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/client/RpaClient.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.Properties;
 

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaBean.java
index d1edaea..ecbb0ba 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaBean.java
@@ -22,12 +22,12 @@
 
 package com.sun.devtest.admin.synchronization.api.security.shopping;
 
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
 import java.util.Vector;
 import java.lang.String;
 import java.util.Iterator;
-import javax.ejb.EJBException;
+import jakarta.ejb.EJBException;
 import java.rmi.RemoteException;
 /**
  *
@@ -114,7 +114,7 @@
     }
     
     
-    public void setSessionContext(javax.ejb.SessionContext sessionContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext sessionContext) {
         sc = sessionContext;
     }
     

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaHome.java
index e520210..3dbcf57 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaHome.java
@@ -21,7 +21,7 @@
  */
 
 package com.sun.devtest.admin.synchronization.api.security.shopping;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 /**
  *
  * @author  Harpreet Singh
@@ -29,6 +29,6 @@
 public interface RpaHome extends EJBHome{
     
     public RpaRemote create(java.lang.String shopperName) 
-        throws java.rmi.RemoteException, javax.ejb.CreateException;
+        throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaRemote.java
index 425d2e2..12bf795 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/api/security/shopping/RpaRemote.java
@@ -21,7 +21,7 @@
  */
 
 package com.sun.devtest.admin.synchronization.api.security.shopping;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 /**
  * Shopping Cart Stateful Session Bean. Just tests -Dj2eelogin.name 
  *  -Dj2eelogin.password system properties.

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupBean.java
index c9fbc1d..818365f 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupBean.java
@@ -18,9 +18,9 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import java.math.*;
 import javax.naming.*;
 

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemote.java
index e9b5b2e..9e71d85 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.devtest.admin.notification.lookup.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemoteHome.java
index d6caede..31c55b8 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/ee/admin/synchronization/cleaner/application/ejb/LookupRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  */

appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/client/Client.java
index 64198ba..1b773b7 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/client/Client.java
@@ -18,8 +18,8 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;

appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1.java b/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1.java
index 701e04d..7362330 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1.java
@@ -16,7 +16,7 @@
 
 package com.oracle.hk2devtest.isolation1;
 
-import javax.ejb.Remote;
+import jakarta.ejb.Remote;
 
 @Remote
 public interface Isolation1 {

appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1Bean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1Bean.java b/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1Bean.java
index e7ac9f9..74b2d2f 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1Bean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/hk2/ejb/isolation/ejb/one/src/main/java/com/oracle/hk2devtest/isolation1/Isolation1Bean.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 
-import javax.ejb.EJB;
-import javax.ejb.LocalBean;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.LocalBean;
+import jakarta.ejb.Stateless;
 
 @Stateless
 @LocalBean

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/Jaxr.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/Jaxr.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/Jaxr.java
index c200e6c..06d78e8 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/Jaxr.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/Jaxr.java
@@ -16,7 +16,7 @@
 
 package jaxr;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrBean.java
index 40dae12..d6f3bee 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrBean.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 import javax.xml.registry.*;

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrClient.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrClient.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrClient.java
index b0c02c7..b1dae96 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrClient.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrClient.java
@@ -19,7 +19,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import jaxr.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrHome.java
index b99a245..6b8e97e 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrHome.java
@@ -20,8 +20,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface JaxrHome extends EJBHome {

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrRemote.java
index de19285..eeb8cb7 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/jaxr/JaxrRemote.java
@@ -16,7 +16,7 @@
 
 package jaxr;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/Jaxr.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/Jaxr.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/Jaxr.java
index c200e6c..06d78e8 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/Jaxr.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/Jaxr.java
@@ -16,7 +16,7 @@
 
 package jaxr;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrBean.java
index b07d5c3..3167800 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrBean.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 import javax.xml.registry.*;

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrClient.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrClient.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrClient.java
index 73c0dba..0b7ec1a 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrClient.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrClient.java
@@ -19,7 +19,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import jaxr.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrHome.java
index b99a245..6b8e97e 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrHome.java
@@ -20,8 +20,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface JaxrHome extends EJBHome {

appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrRemote.java
index de19285..eeb8cb7 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jaxr/soar/jaxr/JaxrRemote.java
@@ -16,7 +16,7 @@
 
 package jaxr;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java
index e848f92..8f0a662 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/LargeProject.java
@@ -23,7 +23,7 @@
 /**
  * Local interface for the large project bean.
  * This is the bean's public/local interface for the clients usage.
- * All locals must extend the javax.ejb.EJBLocalObject.
+ * All locals must extend the jakarta.ejb.EJBLocalObject.
  * The bean itself does not have to implement the local interface, but must implement all of the methods.
  */
 @Entity

appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java
index 35f9247..c0995f0 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/jpa-integration/toplink-essentials/advanced/ejb/SmallProject.java
@@ -23,7 +23,7 @@
 /**
  * Local interface for the small project bean.
  * This is the bean's public/local interface for the clients usage.
- * All locals must extend the javax.ejb.EJBLocalObject.
+ * All locals must extend the jakarta.ejb.EJBLocalObject.
  * The bean itself does not have to implement the local interface, but must implement all of the methods.
  */
 @Entity

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterBean.java
index ff375cf..c44dddf 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterBean.java
@@ -18,13 +18,13 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.TimedObject;
-import javax.ejb.TimerService;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.EJBException;
 import java.math.*;
 
 /**

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemote.java
index eac4529..1115b66 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.ejb.stateless.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemoteHome.java
index 1c1447a..dbaf166 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/converter/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/client/Client.java
index 42d8501..61c2b2e 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/client/Client.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 import java.util.Properties;
 
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.RemoveException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderBean.java
index f760ccb..9d46dc3 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderBean.java
@@ -16,9 +16,9 @@
 
 package examples.sfsb;
 
-import javax.ejb.CreateException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -84,7 +84,7 @@
    * <code>TraderHome.create()</code>, the container allocates an instance of 
    * the EJBean and calls <code>ejbCreate()</code>.
    *
-   * @exception               javax.ejb.CreateException
+   * @exception               jakarta.ejb.CreateException
    *                          if there is a problem creating the bean
    * @see                     examples.ejb20.basic.statefulSession.Trader
    */

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderHome.java
index ce39d24..491bc7c 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderHome.java
@@ -17,8 +17,8 @@
 package examples.sfsb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface TraderHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderRemote.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderRemote.java
index 474f2dc..b07a116 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbjar/ejb/TraderRemote.java
@@ -16,7 +16,7 @@
 
 package examples.sfsb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import java.rmi.RemoteException;
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/FedTaxEjb.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/FedTaxEjb.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/FedTaxEjb.java
index 36ff3b0..f45cb45 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/FedTaxEjb.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/FedTaxEjb.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class FedTaxEjb implements SessionBean {

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/StateTaxEjb.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/StateTaxEjb.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/StateTaxEjb.java
index 293abc0..78cea45 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/StateTaxEjb.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/ejbws/ejb/StateTaxEjb.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class StateTaxEjb implements SessionBean {

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/jms1/simple/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/jms1/simple/ejb/SimpleMessageBean.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/jms1/simple/ejb/SimpleMessageBean.java
index c5557bc..49924a4 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/jms1/simple/ejb/SimpleMessageBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/jms1/simple/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.ejb.mdb.simple.ejb;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 import java.util.*;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/client/Client.java
index 724c6a6..b6d8ef8 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/client/Client.java
@@ -18,7 +18,7 @@
 
 import javax.naming.*;
 import jakarta.jms.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.rmi.PortableRemoteObject;
 import java.util.HashSet;
 import java.util.Set;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/descriptor/ejb-jar.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/descriptor/ejb-jar.xml b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/descriptor/ejb-jar.xml
index db85c21..744f41d 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/descriptor/ejb-jar.xml
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/descriptor/ejb-jar.xml
@@ -56,7 +56,7 @@
         <ejb-name>TimerSessionEJB</ejb-name>
         <method-name>ejbTimeout</method-name>
         <method-params>
-          <method-param>javax.ejb.Timer</method-param>
+          <method-param>jakarta.ejb.Timer</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSession.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSession.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSession.java
index d0014ae..8276e66 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSession.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSession.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1asdev.ejb.timer.restore;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 
 public interface TimerSession extends EJBObject {

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionEJB.java
index f1b8aa3..d434929 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionEJB.java
@@ -19,13 +19,13 @@
 import java.util.Iterator;
 import java.util.Date;
 
-import javax.ejb.TimedObject;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.TimerService;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import jakarta.jms.Session;
 import java.rmi.RemoteException;
 import jakarta.jms.QueueConnectionFactory;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionHome.java
index 05a407f..097a0e0 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/timer/ejb/TimerSessionHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1asdev.ejb.timer.restore;
 
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 public interface TimerSessionHome extends EJBHome {
 	TimerSession create() throws CreateException, RemoteException;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/Customer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/Customer.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/Customer.java
index 7a6bf17..d190dab 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/Customer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/Customer.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingEJB.java
index 8879baa..4c60179 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingHome.java
index 465c83b..b2d5e16 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerEJB.java
index 56c27da..ec56481 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerHome.java
index 231617f..ade55bc 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsEJB.java
index 1e241c7..fb87195 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsHome.java
index a2476a2..46260bb 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/Customer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/Customer.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/Customer.java
index d4ad2e8..0b2bcde 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/Customer.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/Customer.java
@@ -12,7 +12,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java
index 18616ba..09816dd 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java
@@ -10,7 +10,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingHome.java
index 92e5b99..3ea52d6 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerCheckingHome.java
@@ -13,8 +13,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerEJB.java
index b95f506..44339d5 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerEJB.java
@@ -10,12 +10,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerHome.java
index fa81eea..b7ace22 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerHome.java
@@ -12,6 +12,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java
index c7dd64d..f3bcaa8 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java
@@ -10,7 +10,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsHome.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsHome.java
index b0553dd..e95dc30 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/ejb/CustomerSavingsHome.java
@@ -13,8 +13,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/servlet/SimpleBankServlet.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/servlet/SimpleBankServlet.java
index bbb7973..d300bc2 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/servlet/SimpleBankServlet.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/samples/ejb/subclassing/servlet/SimpleBankServlet.java
@@ -16,7 +16,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 

appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/servlet/SimpleBankServlet.java b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/servlet/SimpleBankServlet.java
index d8e8547..173d712 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/servlet/SimpleBankServlet.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/lazyInit/webear/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 

appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/client/Client.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/client/Client.java
index 04d25a5..dba3770 100755
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SfulEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SfulEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SfulEJB.java
index 8ecc9aa..2779d3b 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SfulEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateful;
-import javax.ejb.RemoteInterface;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.RemoteInterface;
 
 @Stateful
 @RemoteInterface({Sful.class})

appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SlessEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SlessEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SlessEJB.java
index b779eb6..75d5829 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SlessEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/persistence-annotation/ejb30/ejb/SlessEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateless;
-import javax.ejb.RemoteInterface;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.RemoteInterface;
 @Stateless
 @RemoteInterface({Sless.class})
 public class SlessEJB implements Sless

appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloEJB.java
index 77a4d14..fb072a7 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloEJB.java
@@ -18,7 +18,7 @@
 
 import jakarta.mail.MailSessionDefinition;
 import jakarta.mail.MailSessionDefinitions;
-import javax.ejb.Stateless;
+import jakarta.ejb.Stateless;
 import javax.naming.InitialContext;
 
 

appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloStatefulEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloStatefulEJB.java b/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloStatefulEJB.java
index ed43005..95f809d 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloStatefulEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/ejb/HelloStatefulEJB.java
@@ -19,7 +19,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.mail.MailSessionDefinition;
 import jakarta.mail.MailSessionDefinitions;
-import javax.ejb.Stateful;
+import jakarta.ejb.Stateful;
 import javax.naming.InitialContext;
 
 @MailSessionDefinitions(

appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/servlet/Servlet.java

diff --git a/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/servlet/Servlet.java b/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/servlet/Servlet.java
index 3102913..55a99e8 100644
--- a/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/servlet/Servlet.java
+++ b/appserver/tests/v2-tests/appserv-tests/devtests/resources/mail-session/servlet/Servlet.java
@@ -19,9 +19,9 @@
 import jakarta.annotation.Resource;
 import jakarta.mail.MailSessionDefinition;
 import jakarta.mail.MailSessionDefinitions;
-import javax.ejb.EJB;
-import javax.ejb.EJBException;
-import javax.ejb.EJBs;
+import jakarta.ejb.EJB;
+import jakarta.ejb.EJBException;
+import jakarta.ejb.EJBs;
 import javax.naming.InitialContext;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -184,7 +184,7 @@
                 sleepFor(2);
                 helloStateful.ping();
                 //throw new EJBException("Did not get ConcurrentAccessException");
-            } catch (javax.ejb.ConcurrentAccessException conEx) {
+            } catch (jakarta.ejb.ConcurrentAccessException conEx) {
                 ;   //Everything is fine
             } catch (Throwable th) {
                 throw new EJBException("Got some wierd exception: " + th);

appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterBean.java
index ff375cf..c44dddf 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterBean.java
@@ -18,13 +18,13 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.TimedObject;
-import javax.ejb.TimerService;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.EJBException;
 import java.math.*;
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemote.java
index eac4529..1115b66 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.ejb.stateless.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemoteHome.java
index 1c1447a..dbaf166 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/avk/ejb/stateless/converter/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java
index b066de5..817e3d7 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.resource.cci.*;
 import javax.resource.ResourceException;
 import javax.naming.*;

appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemote.java
index 6e9003c..39abd65 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface CoffeeRemote extends EJBObject {

appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemoteHome.java
index 05787c1..560ee5b 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci-embedded/ejb/CoffeeRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface CoffeeRemoteHome extends EJBHome {
     CoffeeRemote create() throws RemoteException, CreateException;

appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java
index 0b017e8..2e668cc 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeBean.java
@@ -18,7 +18,7 @@
 
 import java.math.BigDecimal;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.resource.cci.*;
 import javax.resource.ResourceException;
 import javax.naming.*;

appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemote.java
index 6e9003c..39abd65 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.connector.cci;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface CoffeeRemote extends EJBObject {

appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemoteHome.java
index 05787c1..560ee5b 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/connector/cci/ejb/CoffeeRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface CoffeeRemoteHome extends EJBHome {
     CoffeeRemote create() throws RemoteException, CreateException;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Course.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Course.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Course.java
index 8c8d171..d2a4674 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Course.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Course.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseBean.java
index e91eea7..aa8eec0 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseHome.java
index 11b68d5..a969a3b 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/CourseHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
-import javax.ejb.CreateException;
+import jakarta.ejb.FinderException;
+import jakarta.ejb.CreateException;
 
 public interface CourseHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Enroller.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Enroller.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Enroller.java
index 3d3aec8..1ed88fd 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Enroller.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Enroller.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface Enroller extends EJBObject {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerBean.java
index 053d361..ce9877f 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException; 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerHome.java
index 45ce224..2a6b49d 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/EnrollerHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface EnrollerHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Student.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Student.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Student.java
index 890c3de..6a8bd29 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Student.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/Student.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
 import java.util.ArrayList;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentBean.java
index e4ac139..b45e517 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentBean.java
@@ -19,7 +19,7 @@
 import java.sql.*;
 import javax.sql.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentHome.java
index c9897b5..2ae3de5 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/enroller/ejb/StudentHome.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.ejb.bmp.enroller.ejb;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 
 public interface StudentHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Address.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Address.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Address.java
index b8d9f0f..db6718e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Address.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Address.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Address extends javax.ejb.EJBObject {
+public interface Address extends jakarta.ejb.EJBObject {
     public String getName() throws RemoteException;
 
     public String getAddress() throws RemoteException;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressEJB.java
index 9e1268e..21e87d1 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.bmp.robean.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class AddressEJB implements javax.ejb.EntityBean {
+public class AddressEJB implements jakarta.ejb.EntityBean {
     //database fields
     String SSN;
     String firstName;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressHome.java
index 56a1053..a7108a6 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/AddressHome.java
@@ -17,9 +17,9 @@
 package samples.ejb.bmp.robean.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface AddressHome extends javax.ejb.EJBHome {
+public interface AddressHome extends jakarta.ejb.EJBHome {
     public Address findByPrimaryKey(String SSN) throws FinderException, RemoteException; 
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Customer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Customer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Customer.java
index b83b704..67c95f7 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Customer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/Customer.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject {
+public interface Customer extends jakarta.ejb.EJBObject {
     public double getBalance() throws RemoteException;
 
     public void doCredit(double amount) throws RemoteException;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerEJB.java
index 5794e27..21fddce 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.bmp.robean.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean {
+public class CustomerEJB implements jakarta.ejb.EntityBean {
     //database fields
     double balance;
     EntityContext ejbContext = null;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerHome.java
index 449e4d7..6b2e329 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerHome.java
@@ -17,9 +17,9 @@
 package samples.ejb.bmp.robean.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
     public Customer findByPrimaryKey(PKString SSN) throws FinderException, RemoteException; 
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefresh.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefresh.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefresh.java
index 23b1e27..9f70026 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefresh.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefresh.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerProgRefresh extends javax.ejb.EJBObject {
+public interface CustomerProgRefresh extends jakarta.ejb.EJBObject {
     public double getBalance() throws RemoteException;
 }

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshEJB.java
index fcbe5d0..c3ff5d4 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.bmp.robean.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerProgRefreshEJB implements javax.ejb.EntityBean {
+public class CustomerProgRefreshEJB implements jakarta.ejb.EntityBean {
     //database fields
     double balance;
     EntityContext ejbContext = null;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshHome.java
index 03a353c..a6d4fc4 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerProgRefreshHome.java
@@ -17,9 +17,9 @@
 package samples.ejb.bmp.robean.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface CustomerProgRefreshHome extends javax.ejb.EJBHome {
+public interface CustomerProgRefreshHome extends jakarta.ejb.EJBHome {
     public CustomerProgRefresh findByPrimaryKey(PKString1 SSN) throws FinderException, RemoteException; 
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefresh.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefresh.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefresh.java
index 60b94aa..f71cc0a 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefresh.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefresh.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerRefresh extends javax.ejb.EJBObject {
+public interface CustomerRefresh extends jakarta.ejb.EJBObject {
     public double getBalance() throws RemoteException;
 }

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshEJB.java
index 13606a9..17bfd00 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.bmp.robean.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerRefreshEJB implements javax.ejb.EntityBean {
+public class CustomerRefreshEJB implements jakarta.ejb.EntityBean {
     //database fields
     double balance;
     EntityContext ejbContext = null;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshHome.java
index a33efca..505df3a 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerRefreshHome.java
@@ -17,9 +17,9 @@
 package samples.ejb.bmp.robean.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface CustomerRefreshHome extends javax.ejb.EJBHome {
+public interface CustomerRefreshHome extends jakarta.ejb.EJBHome {
     public CustomerRefresh findByPrimaryKey(String SSN) throws FinderException, RemoteException; 
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactional.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactional.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactional.java
index e3d888a..de22140 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactional.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactional.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerTransactional extends javax.ejb.EJBObject {
+public interface CustomerTransactional extends jakarta.ejb.EJBObject {
     public double getBalance() throws RemoteException;
 }

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalEJB.java
index 2e8dd82..dbfa22d 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.bmp.robean.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerTransactionalEJB implements javax.ejb.EntityBean {
+public class CustomerTransactionalEJB implements jakarta.ejb.EntityBean {
     //database fields
     double balance;
     EntityContext ejbContext = null;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalHome.java
index 125f8fb..50e94c2 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/bmp/robean/ejb/CustomerTransactionalHome.java
@@ -17,9 +17,9 @@
 package samples.ejb.bmp.robean.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface CustomerTransactionalHome extends javax.ejb.EJBHome {
+public interface CustomerTransactionalHome extends jakarta.ejb.EJBHome {
     public CustomerTransactional findByPrimaryKey(String SSN) throws FinderException, RemoteException; 
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LineItemBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LineItemBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LineItemBean.java
index 0c3f10e..da6347c 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LineItemBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LineItemBean.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class LineItemBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItem.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItem.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItem.java
index f1a4b90..8602a33 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItem.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItem.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalLineItem extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItemHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItemHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItemHome.java
index 51397a5..cfaf28a 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItemHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalLineItemHome.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalLineItemHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrder.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrder.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrder.java
index 82f123d..9fd207c 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrder.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrder.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalOrder extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrderHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrderHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrderHome.java
index d904afc..f658e3e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrderHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalOrderHome.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalOrderHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPart.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPart.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPart.java
index 35e3f85..1c24e40 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPart.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPart.java
@@ -17,7 +17,7 @@
 package dataregistry;
 
 import java.util.Collection;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalPart extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPartHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPartHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPartHome.java
index bfc3dc0..3a2ca4e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPartHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalPartHome.java
@@ -19,7 +19,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalPartHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendor.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendor.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendor.java
index ae0c18c..e90fb9c 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendor.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendor.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendor extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorHome.java
index 475b0da..a6125bf 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorHome.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendorHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPart.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPart.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPart.java
index 6cd8c16..b1f74ff 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPart.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPart.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendorPart extends EJBLocalObject {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPartHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPartHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPartHome.java
index 3e38aef..b3640da 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPartHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/LocalVendorPartHome.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface LocalVendorPartHome extends EJBLocalHome {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/OrderBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/OrderBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/OrderBean.java
index 038f42f..8390038 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/OrderBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/OrderBean.java
@@ -20,7 +20,7 @@
 import java.util.Date;
 import java.util.Iterator;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class OrderBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/PartBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/PartBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/PartBean.java
index dc0a56f..30960f2 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/PartBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/PartBean.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 import java.util.Date;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class PartBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorBean.java
index 9dc1443..5cce12e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorBean.java
@@ -18,7 +18,7 @@
 
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class VendorBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorPartBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorPartBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorPartBean.java
index 5b64640..d7de1d8 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorPartBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/VendorPartBean.java
@@ -16,7 +16,7 @@
 
 package dataregistry;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public abstract class VendorPartBean implements EntityBean {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/Request.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/Request.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/Request.java
index c11b937..0ba131c 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/Request.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/Request.java
@@ -19,7 +19,7 @@
 import java.rmi.RemoteException;
 import java.util.Collection;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface Request extends EJBObject {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestBean.java
index ac63fa8..aebd6e6 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestBean.java
@@ -20,7 +20,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 
 import dataregistry.*;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestHome.java
index 866589d..5bdf34f 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/orderapp/ejb/request/RequestHome.java
@@ -17,7 +17,7 @@
 package request;
 
 import java.rmi.RemoteException;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 
 public interface RequestHome extends EJBHome {

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-roster.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-roster.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-roster.xml
index da7e8ab..e1e8d33 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-roster.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-roster.xml
@@ -209,7 +209,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -310,7 +310,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-team.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-team.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-team.xml
index 9c9a973..0b779ad 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-team.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/descriptor/ejb-jar-team.xml
@@ -332,7 +332,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
       <method>
@@ -517,7 +517,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>
@@ -612,7 +612,7 @@
         <method-intf>Local</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBLocalObject</method-param>
+          <method-param>jakarta.ejb.EJBLocalObject</method-param>
         </method-params>
       </method>
     </method-permission>

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LeagueBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LeagueBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LeagueBean.java
index b74a18b..c0d7798 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LeagueBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LeagueBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1peqe.ejb.cmp.roster.util.Debug;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeague.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeague.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeague.java
index b374e14..bf6ffc8 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeague.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeague.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeague extends EJBLocalObject {
     public String getLeagueId();

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeagueHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeagueHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeagueHome.java
index bf11416..c8ecf4d 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeagueHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalLeagueHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalLeagueHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayer.java
index a07706c..2e65244 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayer.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayer extends EJBLocalObject {
     public String getPlayerId();

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayerHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayerHome.java
index af9e1a8..47a18d6 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalPlayerHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalPlayerHome extends EJBLocalHome {
     

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeam.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeam.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeam.java
index 258401c..9fab910 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeam.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeam.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeam extends EJBLocalObject {
     public String getTeamId();

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeamHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeamHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeamHome.java
index 517850e..300f1da 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeamHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/LocalTeamHome.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 public interface LocalTeamHome extends EJBLocalHome {
     public LocalTeam create (String id, String name, String city)

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/PlayerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/PlayerBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/PlayerBean.java
index b739fdf..23c33a4 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/PlayerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/PlayerBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1peqe.ejb.cmp.roster.util.Debug;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/Roster.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/Roster.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/Roster.java
index 5531589..02b5517 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/Roster.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/Roster.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import com.sun.s1peqe.ejb.cmp.roster.util.*;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterBean.java
index ca002a3..8879496 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterBean.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1peqe.ejb.cmp.roster.util.*;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterHome.java
index ed64db3..86294eb 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/RosterHome.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface RosterHome extends EJBHome {
     Roster create() throws RemoteException, CreateException;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/TeamBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/TeamBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/TeamBean.java
index 9755246..5b12920 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/TeamBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/cmp/roster/ejb/TeamBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.ejb.cmp.roster.ejb;
 
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import com.sun.s1peqe.ejb.cmp.roster.util.Debug;
 import com.sun.s1peqe.ejb.cmp.roster.util.PlayerDetails;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/client/Client.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/client/Client.java
index 04d25a5..dba3770 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session.*;
 import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SfulEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SfulEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SfulEJB.java
index a68148d..6358149 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SfulEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SfulEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateful;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateful;
+import jakarta.ejb.Remote;
 
 @Stateful
 @Remote({Sful.class})

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SlessEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SlessEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SlessEJB.java
index ac0369e..7b2bf11 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SlessEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/ejb/SlessEJB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1asdev.ejb.ejb30.hello.session;
 
-import javax.ejb.Stateless;
-import javax.ejb.Remote;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.Remote;
 
 @Stateless
 @Remote({Sless.class})

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/testng-client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/testng-client/Client.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/testng-client/Client.java
index 223b2d7..9aeaa30 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/testng-client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/hello/session/testng-client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJB;
+import jakarta.ejb.EJB;
 import com.sun.s1asdev.ejb.ejb30.hello.session.*;
 
 import org.testng.Assert;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/client/Client.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/client/Client.java
index 19a8c58..d8c3332 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.rmi.*;
 import pe.ejb.ejb30.persistence.toplinksample.ejb.*;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java
index 13305c2..6b7b38a 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/ejb/StatelessBean.java
@@ -16,7 +16,7 @@
 
 package pe.ejb.ejb30.persistence.toplinksample.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.persistence.*;
 import jakarta.annotation.*;
 import javax.sql.*;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/testng-client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/testng-client/Client.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/testng-client/Client.java
index f832692..8b97afa 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/testng-client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/ejb30/persistence/onetomany/testng-client/Client.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.rmi.*;
 import pe.ejb.ejb30.persistence.toplinksample.ejb.*;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/mdb/simple/ejb/SimpleMessageBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/mdb/simple/ejb/SimpleMessageBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/mdb/simple/ejb/SimpleMessageBean.java
index c5557bc..49924a4 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/mdb/simple/ejb/SimpleMessageBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/mdb/simple/ejb/SimpleMessageBean.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.ejb.mdb.simple.ejb;
 
-import javax.ejb.MessageDrivenBean;
-import javax.ejb.MessageDrivenContext;
+import jakarta.ejb.MessageDrivenBean;
+import jakarta.ejb.MessageDrivenContext;
 import javax.naming.*;
 import jakarta.jms.*;
 import java.util.*;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/client/SessionTestClient.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/client/SessionTestClient.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/client/SessionTestClient.java
index bfe1996..bfff181 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/client/SessionTestClient.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/client/SessionTestClient.java
@@ -115,7 +115,7 @@
             Thread.sleep(40000);
             //System.out.println("after getting activated"+remote[9].getMessage());
             stat.addStatus(testSuiteID+" "+"10 SFSB Creation",stat.PASS);
-        }catch(javax.ejb.CreateException e){
+        }catch(jakarta.ejb.CreateException e){
             System.out.println("Error while creating beans");
             e.printStackTrace();
             stat.addStatus(testSuiteID+" "+"10 SFSB Creation",stat.FAIL);            
@@ -172,7 +172,7 @@
                 try{
                     remote[i].remove();
                     
-                }catch(javax.ejb.RemoveException e){
+                }catch(jakarta.ejb.RemoveException e){
                     System.out.println("Error while removing  :"+i+"SFSB");
                     if(i==5)
                         System.out.println("Bean 5 throws RemoveException");

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionBean.java
index c8483d0..2382070 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionBean.java
@@ -16,7 +16,7 @@
 
 package sqetests.ejb.stateful.passivate.ejb.stateful;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.*;
 import javax.naming.*;
 import javax.rmi.*;
@@ -32,11 +32,11 @@
  */
 
 
-public class SessionBean implements javax.ejb.SessionBean {
+public class SessionBean implements jakarta.ejb.SessionBean {
     private String message;
     private int lastCalculation;
     private int count = 0;
-    private javax.ejb.SessionContext sessionContext;
+    private jakarta.ejb.SessionContext sessionContext;
     Integer serializedInteger=new Integer(10000);
     UserTransaction userTx=null;
     public Context context=null;
@@ -49,9 +49,9 @@
 
 
     /**
-     * @see javax.ejb.SessionBean#setSessionContext(javax.ejb.SessionContext)
+     * @see jakarta.ejb.SessionBean#setSessionContext(jakarta.ejb.SessionContext)
      */
-    public void setSessionContext(javax.ejb.SessionContext aContext) {
+    public void setSessionContext(jakarta.ejb.SessionContext aContext) {
         sessionContext=aContext;
 
         try{
@@ -68,7 +68,7 @@
 
 
     /**
-     * @see javax.ejb.SessionBean#ejbActivate()
+     * @see jakarta.ejb.SessionBean#ejbActivate()
      */
     public void ejbActivate() {
         //key is method name and value is true/false       
@@ -79,7 +79,7 @@
 
 
     /**
-     * @see javax.ejb.SessionBean#ejbPassivate()
+     * @see jakarta.ejb.SessionBean#ejbPassivate()
      */
     public void ejbPassivate() {
 
@@ -92,7 +92,7 @@
 
 
     /**
-     * @see javax.ejb.SessionBean#ejbRemove()
+     * @see jakarta.ejb.SessionBean#ejbRemove()
      */
     public void ejbRemove() {
         System.out.println("----------SFSB Bean " +message+"  removed--------");
@@ -109,7 +109,7 @@
 
     }
 
-    public void ejbCreate(String initialMessage) throws javax.ejb.CreateException {
+    public void ejbCreate(String initialMessage) throws jakarta.ejb.CreateException {
 	    try{
         beanResult.put(new String("passivate"),new Boolean(false));
         beanResult.put(new String("activate"),new Boolean(false));

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocal.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocal.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocal.java
index 4be51b9..999168b 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocal.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocal.java
@@ -16,7 +16,7 @@
 
 package sqetests.ejb.stateful.passivate.ejb.stateful;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Oct 17, 2003 4:06:59 PM
@@ -24,7 +24,7 @@
  * @author dsingh
  */
 
-public interface SessionLocal extends javax.ejb.EJBLocalObject {
+public interface SessionLocal extends jakarta.ejb.EJBLocalObject {
     
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocalHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocalHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocalHome.java
index ee805ce..9ee4126 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocalHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionLocalHome.java
@@ -16,7 +16,7 @@
 
 package sqetests.ejb.stateful.passivate.ejb.stateful;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Oct 17, 2003 4:06:59 PM
@@ -24,10 +24,10 @@
  * @author dsingh
  */
 
-public interface SessionLocalHome extends javax.ejb.EJBLocalHome {
+public interface SessionLocalHome extends jakarta.ejb.EJBLocalHome {
     
-    public SessionLocal create() throws javax.ejb.CreateException;
+    public SessionLocal create() throws jakarta.ejb.CreateException;
     
-    public SessionLocal create(java.lang.String initialMessage) throws javax.ejb.CreateException;
+    public SessionLocal create(java.lang.String initialMessage) throws jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemote.java
index 9b10b95..48d9577 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemote.java
@@ -16,7 +16,7 @@
 
 package sqetests.ejb.stateful.passivate.ejb.stateful;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.RemoteException;
 import sqetests.ejb.stateful.passivate.util.*;
 import java.util.HashMap;
@@ -27,7 +27,7 @@
  * @author dsingh
  */
 
-public interface SessionRemote extends javax.ejb.EJBObject {    
+public interface SessionRemote extends jakarta.ejb.EJBObject {    
     
     public void badMethod() throws RemoteException;   
     

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemoteHome.java
index e0b7afe..b1adecf 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/passivate/ejb/stateful/SessionRemoteHome.java
@@ -16,7 +16,7 @@
 
 package sqetests.ejb.stateful.passivate.ejb.stateful;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 /**
  * Created Oct 17, 2003 4:06:59 PM
@@ -24,11 +24,11 @@
  * @author dsingh
  */
 
-public interface SessionRemoteHome extends javax.ejb.EJBHome {
+public interface SessionRemoteHome extends jakarta.ejb.EJBHome {
     
     public SessionRemote create()
-    throws javax.ejb.CreateException, java.rmi.RemoteException;
+    throws jakarta.ejb.CreateException, java.rmi.RemoteException;
     
-    public SessionRemote create(java.lang.String initialMessage) throws java.rmi.RemoteException, javax.ejb.CreateException;
+    public SessionRemote create(java.lang.String initialMessage) throws java.rmi.RemoteException, jakarta.ejb.CreateException;
     
 }

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/client/Client.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/client/Client.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/client/Client.java
index 42d8501..61c2b2e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/client/Client.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/client/Client.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 import java.util.Properties;
 
-import javax.ejb.CreateException;
-import javax.ejb.RemoveException;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.RemoveException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderBean.java
index f760ccb..9d46dc3 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderBean.java
@@ -16,9 +16,9 @@
 
 package examples.sfsb;
 
-import javax.ejb.CreateException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -84,7 +84,7 @@
    * <code>TraderHome.create()</code>, the container allocates an instance of 
    * the EJBean and calls <code>ejbCreate()</code>.
    *
-   * @exception               javax.ejb.CreateException
+   * @exception               jakarta.ejb.CreateException
    *                          if there is a problem creating the bean
    * @see                     examples.ejb20.basic.statefulSession.Trader
    */

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderHome.java
index ce39d24..491bc7c 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderHome.java
@@ -17,8 +17,8 @@
 package examples.sfsb;
 
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface TraderHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderRemote.java
index 474f2dc..b07a116 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateful/persistence/ejb/TraderRemote.java
@@ -16,7 +16,7 @@
 
 package examples.sfsb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import java.rmi.RemoteException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterBean.java
index 94c1506..c0cdf30 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterBean.java
@@ -18,13 +18,13 @@
 
 import java.util.Collection;
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.TimedObject;
-import javax.ejb.TimerService;
-import javax.ejb.Timer;
-import javax.ejb.TimerHandle;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.TimedObject;
+import jakarta.ejb.TimerService;
+import jakarta.ejb.Timer;
+import jakarta.ejb.TimerHandle;
+import jakarta.ejb.EJBException;
 import java.math.*;
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemote.java
index 25c38e8..67f7faa 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.ejb.stateless.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemoteHome.java
index 1cb1eb9..7f75826 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/ejb/stateless/converter/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/descriptor/ejb-jar.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/descriptor/ejb-jar.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/descriptor/ejb-jar.xml
index 1a7a49c..c348ab8 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/descriptor/ejb-jar.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/descriptor/ejb-jar.xml
@@ -70,7 +70,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <method>
@@ -108,7 +108,7 @@
         <method-intf>Remote</method-intf>
         <method-name>isIdentical</method-name>
         <method-params>
-          <method-param>javax.ejb.EJBObject</method-param>
+          <method-param>jakarta.ejb.EJBObject</method-param>
         </method-params>
       </method>
       <method>

appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReader.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReader.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReader.java
index 04838cd..1d720d5 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReader.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReader.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.jndi.url.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface HTMLReader extends EJBObject {

appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderBean.java
index 52ada0c..17a88d1 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderBean.java
@@ -17,7 +17,7 @@
 package com.sun.s1peqe.jndi.url.ejb;
 
 import javax.naming.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.net.*;
 import java.io.*;
 

appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderHome.java
index 36816bc..fde952e 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/jndi/url/ejb/HTMLReaderHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 public interface HTMLReaderHome extends EJBHome {
 

appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/client/MethodPermClient.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/client/MethodPermClient.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/client/MethodPermClient.java
index ddfaa51..efa3d92 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/client/MethodPermClient.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/client/MethodPermClient.java
@@ -18,7 +18,7 @@
 
 import java.io.*;
 import java.util.*;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import javax.naming.*;
 import javax.rmi.PortableRemoteObject;
 import org.omg.CORBA.ORB;

appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermBean.java
index 79be9d0..1803225 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermBean.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 public class MethodPermBean implements SessionBean {
     private String str;

appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemote.java
index ebe09d2..f4adedd 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.security.authoriz.methodperms;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 import java.io.Serializable;

appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemoteHome.java
index a6eb166..4be614b 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/authoriz/methodperms/ejb/MethodPermRemoteHome.java
@@ -20,8 +20,8 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
 
 
 public interface MethodPermRemoteHome extends EJBHome {

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/client/BeanTestClient.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/client/BeanTestClient.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/client/BeanTestClient.java
index 8958c6a..558c5fc 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/client/BeanTestClient.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/client/BeanTestClient.java
@@ -18,11 +18,11 @@
 
 import java.util.Properties;
 import javax.naming.*;
-import javax.ejb.SessionContext;
-import javax.ejb.CreateException;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.CreateException;
 import javax.naming.NamingException;
-import javax.ejb.EJBObject;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBObject;
+import jakarta.ejb.EJBHome;
 import javax.rmi.PortableRemoteObject;
 
 import java.util.logging.*;
@@ -86,7 +86,7 @@
           ejbObject=((CustomerRemoteHome)ejbHome).createCustomer(customerID,customerID);
 	  System.out.println("Remote interface of Customer Bean"+ejbObject.getClass().getName());
           
-      }catch(javax.ejb.DuplicateKeyException e) {
+      }catch(jakarta.ejb.DuplicateKeyException e) {
           System.out.println("Exception:Customer already exists");
       }
       catch (Throwable e) {
@@ -109,7 +109,7 @@
 	  System.out.println("inside getting remote interface");
 	  try{
 		  try{ejbObject=((CustomerRemoteHome)ejbHome).findByPrimaryKey(customerID);
-		  }catch(javax.ejb.ObjectNotFoundException e){System.out.println("customer does not exist");}
+		  }catch(jakarta.ejb.ObjectNotFoundException e){System.out.println("customer does not exist");}
 		  if(ejbObject==null)
 		  {
 			  System.out.println("Creating customer..."+customerID);

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/descriptor/ejb-jar.xml

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/descriptor/ejb-jar.xml b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/descriptor/ejb-jar.xml
index 32b5c7d..c7f6640 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/descriptor/ejb-jar.xml
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/descriptor/ejb-jar.xml
@@ -228,7 +228,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>Required</trans-attribute>
@@ -355,7 +355,7 @@
         <method-intf>Home</method-intf>
         <method-name>remove</method-name>
         <method-params>
-          <method-param>javax.ejb.Handle</method-param>
+          <method-param>jakarta.ejb.Handle</method-param>
         </method-params>
       </method>
       <trans-attribute>RequiresNew</trans-attribute>

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountBean.java
index 4b28cab..52f177d 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountBean.java
@@ -17,11 +17,11 @@
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
 import java.util.HashMap;
-import javax.ejb.EntityContext;
+import jakarta.ejb.EntityContext;
 import java.util.logging.*;
 import com.sun.ejte.ccl.reporter.*;
 
-public abstract class AccountBean extends EnterpriseBeanLogger implements javax.ejb.EntityBean
+public abstract class AccountBean extends EnterpriseBeanLogger implements jakarta.ejb.EntityBean
 {
     
     private static Logger logger = Logger.getLogger("bank.admin");
@@ -40,7 +40,7 @@
         //Business methods
 
     public String ejbCreateAccount(AccountDataObject ado)
-    throws javax.ejb.CreateException
+    throws jakarta.ejb.CreateException
     {
 
         toXML("ejbCreateAccount","Enter");
@@ -55,7 +55,7 @@
 
 
     public void ejbPostCreateAccount(AccountDataObject ado)
-    throws javax.ejb.CreateException
+    throws jakarta.ejb.CreateException
     {}
 
     public AccountDataObject getDAO()

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocal.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocal.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocal.java
index 7e62107..688162e 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocal.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocal.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
-public interface AccountLocal extends javax.ejb.EJBLocalObject
+public interface AccountLocal extends jakarta.ejb.EJBLocalObject
 {
 	public AccountDataObject getDAO();
 	

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocalHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocalHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocalHome.java
index 332712b..99eb972 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocalHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountLocalHome.java
@@ -17,14 +17,14 @@
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 import java.util.Date;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface AccountLocalHome extends javax.ejb.EJBLocalHome
+public interface AccountLocalHome extends jakarta.ejb.EJBLocalHome
 {
 	public AccountLocal createAccount (AccountDataObject dao)
-	throws javax.ejb.CreateException;
-        public AccountLocal findByPrimaryKey(String id) throws javax.ejb.FinderException;
+	throws jakarta.ejb.CreateException;
+        public AccountLocal findByPrimaryKey(String id) throws jakarta.ejb.FinderException;
 }

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemote.java
index f249630..c787813 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemote.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 
-public interface AccountRemote extends javax.ejb.EJBObject
+public interface AccountRemote extends jakarta.ejb.EJBObject
 {
 	public AccountDataObject getDAO() throws java.rmi.RemoteException;
 }

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemoteHome.java
index 30be27a..8dcbdda 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/AccountRemoteHome.java
@@ -17,16 +17,16 @@
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.util.Date;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface AccountRemoteHome extends javax.ejb.EJBHome
+public interface AccountRemoteHome extends jakarta.ejb.EJBHome
 {
 	public AccountRemote createAccount (AccountDataObject dao)
-	throws javax.ejb.CreateException,RemoteException;
-        public AccountRemote findByPrimaryKey(String id) throws javax.ejb.FinderException,RemoteException;
+	throws jakarta.ejb.CreateException,RemoteException;
+        public AccountRemote findByPrimaryKey(String id) throws jakarta.ejb.FinderException,RemoteException;
 
 }

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerBean.java
index 7090ffa..619fb2b 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerBean.java
@@ -16,16 +16,16 @@
 
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
-import javax.ejb.EntityContext;
+import jakarta.ejb.EntityContext;
 import java.util.Collection;
 import java.util.logging.*;
-import javax.ejb.*;
+import jakarta.ejb.*;
 
 import com.sun.ejte.ccl.reporter.*;
 
 
 
-public abstract class CustomerBean extends EnterpriseBeanLogger implements javax.ejb.EntityBean
+public abstract class CustomerBean extends EnterpriseBeanLogger implements jakarta.ejb.EntityBean
 {
     AccountLocalHome accountHome=null;
     public javax.naming.Context jndiContext=null;
@@ -49,7 +49,7 @@
         //Business methods
 
     public String ejbCreateCustomer(String id,String name)
-    throws javax.ejb.CreateException
+    throws jakarta.ejb.CreateException
     {
         
         toXML("ejbCreateCustomer","Enter");
@@ -118,7 +118,7 @@
     }
 
     public void ejbPostCreateCustomer(String id,String name)
-    throws javax.ejb.CreateException
+    throws jakarta.ejb.CreateException
     {}
 
     public EntityContext ejbContext;

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocal.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocal.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocal.java
index 5c99630..41409d6 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocal.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocal.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
-import javax.ejb.EJBLocalObject;
+import jakarta.ejb.EJBLocalObject;
 
-public interface CustomerLocal extends javax.ejb.EJBLocalObject
+public interface CustomerLocal extends jakarta.ejb.EJBLocalObject
 {
 	public String getCustomerName();
 	public String getCustomerID();

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocalHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocalHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocalHome.java
index 4b2d3e9..e0d9549 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocalHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerLocalHome.java
@@ -17,15 +17,15 @@
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
 import java.util.Collection;
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBLocalHome;
 import java.util.Date;
-import javax.ejb.FinderException;
+import jakarta.ejb.FinderException;
 
-public interface CustomerLocalHome extends javax.ejb.EJBLocalHome
+public interface CustomerLocalHome extends jakarta.ejb.EJBLocalHome
 {
 	public CustomerLocal createCustomer (String id,String name)
-	throws javax.ejb.CreateException;
-        public CustomerLocal findByPrimaryKey(String id) throws javax.ejb.FinderException;
+	throws jakarta.ejb.CreateException;
+        public CustomerLocal findByPrimaryKey(String id) throws jakarta.ejb.FinderException;
 
 }

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemote.java
index 1ee551e..de7028a 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemote.java
@@ -16,10 +16,10 @@
 
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
-public interface CustomerRemote extends javax.ejb.EJBObject
+public interface CustomerRemote extends jakarta.ejb.EJBObject
 {
   public String getCustomerID() throws java.rmi.RemoteException;
   public String getCustomerName() throws java.rmi.RemoteException;

appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemoteHome.java
index 3c07392..f0dbd6e 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/integration/bankadmin/daomanager/ejb/CustomerRemoteHome.java
@@ -16,15 +16,15 @@
 
 package com.sun.s1peqe.security.integration.bankadmin.daomanager;
 
-import javax.ejb.EJBHome;
-import javax.ejb.FinderException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.FinderException;
 import java.util.Collection;
 import java.rmi.RemoteException;
 
-public interface CustomerRemoteHome extends javax.ejb.EJBHome
+public interface CustomerRemoteHome extends jakarta.ejb.EJBHome
 {
     public CustomerRemote createCustomer (String id,String name)
-    throws javax.ejb.CreateException,RemoteException;
+    throws jakarta.ejb.CreateException,RemoteException;
     public CustomerRemote findByPrimaryKey(String id)
-    throws javax.ejb.FinderException,RemoteException;
+    throws jakarta.ejb.FinderException,RemoteException;
 }

appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterBean.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterBean.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterBean.java
index 31c9e69..2f251a7 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterBean.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterBean.java
@@ -17,8 +17,8 @@
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
 import java.rmi.RemoteException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import java.math.*;
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemote.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemote.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemote.java
index aa03689..55bfada 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemote.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemote.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.security.ssl.converter.ejb;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 import java.math.*;
 

appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemoteHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemoteHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemoteHome.java
index 9d9a0f2..d27402a 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemoteHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/ssl/converter/ejb/ConverterRemoteHome.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.EJBHome;
 
 /**
  * Home interface for the <code>ConverterBean</code>. Clients generally use home interface

appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/FedTaxEjb.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/FedTaxEjb.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/FedTaxEjb.java
index 1cd64e6..25b6f07 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/FedTaxEjb.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/FedTaxEjb.java
@@ -17,8 +17,8 @@
 package com.sun.appserv.sqe.security.wss.ejbws.taxcal;
 
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import java.rmi.RemoteException;
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/StateTaxEjb.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/StateTaxEjb.java b/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/StateTaxEjb.java
index cd7aa16..601b8b5 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/StateTaxEjb.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/security/wss/ejbws/ejb/StateTaxEjb.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 /**

appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxBeanA.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxBeanA.java b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxBeanA.java
index 00fa66e..a0b0088 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxBeanA.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxBeanA.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanA;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;

appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteA.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteA.java b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteA.java
index acee150..bff542c 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteA.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteA.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanA;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteA extends EJBObject{

appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteHomeA.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteHomeA.java b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteHomeA.java
index fa3ed51..8f21c4e 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteHomeA.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanA/TxRemoteHomeA.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanA;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeA extends EJBHome {
     public TxRemoteA create() throws RemoteException, CreateException;

appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxBeanB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxBeanB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxBeanB.java
index 6876974..74dd3a3 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxBeanB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxBeanB.java
@@ -16,8 +16,8 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
 
 import java.sql.Statement;
 import java.sql.ResultSet;

appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteB.java
index 5c4a73d..f0832f1 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteB.java
@@ -16,7 +16,7 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
 
-import javax.ejb.EJBObject;
+import jakarta.ejb.EJBObject;
 import java.rmi.RemoteException;
 
 public interface TxRemoteB extends EJBObject{

appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteHomeB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteHomeB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteHomeB.java
index d9e9a53..90053ed 100755
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteHomeB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/transaction/txglobal/ejb/beanB/TxRemoteHomeB.java
@@ -16,9 +16,9 @@
 
 package com.sun.s1peqe.transaction.txglobal.ejb.beanB;
 
-import javax.ejb.EJBHome;
+import jakarta.ejb.EJBHome;
 import java.rmi.RemoteException;
-import javax.ejb.CreateException;
+import jakarta.ejb.CreateException;
 
 public interface TxRemoteHomeB extends EJBHome {
     public TxRemoteB create() throws RemoteException, CreateException;

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/Customer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/Customer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/Customer.java
index 7a6bf17..d190dab 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/Customer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/Customer.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingEJB.java
index 8879baa..4c60179 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingHome.java
index 465c83b..b2d5e16 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerCheckingHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerEJB.java
index 56c27da..ec56481 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerEJB.java
@@ -16,12 +16,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerHome.java
index 231617f..ade55bc 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerHome.java
@@ -18,6 +18,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsEJB.java
index 1e241c7..fb87195 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsEJB.java
@@ -16,7 +16,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsHome.java
index a2476a2..46260bb 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/ejb/CustomerSavingsHome.java
@@ -19,8 +19,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/Customer.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/Customer.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/Customer.java
index d4ad2e8..0b2bcde 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/Customer.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/Customer.java
@@ -12,7 +12,7 @@
 
 import java.rmi.RemoteException;
 
-public interface Customer extends javax.ejb.EJBObject
+public interface Customer extends jakarta.ejb.EJBObject
 {
   public String getLastName() throws RemoteException;
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java
index 18616ba..09816dd 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingEJB.java
@@ -10,7 +10,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingHome.java
index 92e5b99..3ea52d6 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerCheckingHome.java
@@ -13,8 +13,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerCheckingHome extends CustomerHome {
-    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerChecking create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerChecking findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerEJB.java
index b95f506..44339d5 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerEJB.java
@@ -10,12 +10,12 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;
 
-public class CustomerEJB implements javax.ejb.EntityBean
+public class CustomerEJB implements jakarta.ejb.EntityBean
 {
   //database fields
   String SSN;

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerHome.java
index fa81eea..b7ace22 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerHome.java
@@ -12,6 +12,6 @@
 
 import java.rmi.RemoteException;
 
-public interface CustomerHome extends javax.ejb.EJBHome {
+public interface CustomerHome extends jakarta.ejb.EJBHome {
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java
index c7dd64d..f3bcaa8 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsEJB.java
@@ -10,7 +10,7 @@
 
 package samples.ejb.subclassing.ejb;
 
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.naming.*;
 import java.sql.*;
 import javax.sql.DataSource;

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsHome.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsHome.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsHome.java
index b0553dd..e95dc30 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsHome.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/ejb/CustomerSavingsHome.java
@@ -13,8 +13,8 @@
 import java.rmi.RemoteException;
 
 public interface CustomerSavingsHome extends CustomerHome {
-    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,javax.ejb.CreateException;
+    public CustomerSavings create(String SSN, String lastName, String firstName, String address1, String address2, String city, String state, String zipCode) throws RemoteException,jakarta.ejb.CreateException;
 
-    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,javax.ejb.FinderException;
+    public CustomerSavings findByPrimaryKey(String SSN) throws RemoteException,jakarta.ejb.FinderException;
 }
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/servlet/SimpleBankServlet.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/servlet/SimpleBankServlet.java
index bbb7973..d300bc2 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/servlet/SimpleBankServlet.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/samples/ejb/subclassing/servlet/SimpleBankServlet.java
@@ -16,7 +16,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 

appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/servlet/SimpleBankServlet.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/servlet/SimpleBankServlet.java b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/servlet/SimpleBankServlet.java
index d8e8547..173d712 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/servlet/SimpleBankServlet.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/web/subclassing/servlet/SimpleBankServlet.java
@@ -22,7 +22,7 @@
 import javax.naming.*; 
 import javax.servlet.http.*; 
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*; 
+import jakarta.ejb.*; 
 
 import samples.ejb.subclassing.ejb.*; 
 

appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/FedTaxEjb.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/FedTaxEjb.java b/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/FedTaxEjb.java
index 36ff3b0..f45cb45 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/FedTaxEjb.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/FedTaxEjb.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class FedTaxEjb implements SessionBean {

appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/StateTaxEjb.java

diff --git a/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/StateTaxEjb.java b/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/StateTaxEjb.java
index 293abc0..78cea45 100644
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/StateTaxEjb.java
+++ b/appserver/tests/v2-tests/appserv-tests/sqetests/webservices/ejbws/ejb/StateTaxEjb.java
@@ -18,9 +18,9 @@
 
 import java.io.Serializable;
 import java.rmi.RemoteException; 
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.ejb.EJBException;
+import jakarta.ejb.SessionBean;
+import jakarta.ejb.SessionContext;
+import jakarta.ejb.EJBException;
 import javax.naming.*;
 
 public class StateTaxEjb implements SessionBean {

appserver/tests/v2-tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java

diff --git a/appserver/tests/v2-tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java b/appserver/tests/v2-tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
index eb0e977..a6ac08f 100755
--- a/appserver/tests/v2-tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
+++ b/appserver/tests/v2-tests/appserv-tests/util/reporter/EnterpriseBeanLogger.java
@@ -18,7 +18,7 @@
 
 import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
-import javax.ejb.*;
+import jakarta.ejb.*;
 import javax.transaction.*;
 import javax.naming.*;
 
@@ -57,7 +57,7 @@
   private static int instanceCreated;
   protected String instanceName;
 
-  protected boolean prepareLocalAndRemoteObject(String localRef, String remoteRef) throws javax.ejb.CreateException {
+  protected boolean prepareLocalAndRemoteObject(String localRef, String remoteRef) throws jakarta.ejb.CreateException {
     instanceCreated++;
     instanceName = getClass().getName() + "____________________" + instanceCreated;
 

appserver/tests/v2-tests/appserv-tests/util/reporter/PortableAdapter.java

diff --git a/appserver/tests/v2-tests/appserv-tests/util/reporter/PortableAdapter.java b/appserver/tests/v2-tests/appserv-tests/util/reporter/PortableAdapter.java
index 6634321..3db278c 100755
--- a/appserver/tests/v2-tests/appserv-tests/util/reporter/PortableAdapter.java
+++ b/appserver/tests/v2-tests/appserv-tests/util/reporter/PortableAdapter.java
@@ -19,9 +19,9 @@
 import java.io.Serializable;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
-import javax.ejb.FinderException;
+import jakarta.ejb.EJBHome;
+import jakarta.ejb.CreateException;
+import jakarta.ejb.FinderException;
 import java.util.ArrayList;
 
 public interface PortableAdapter{

appserver/tests/v2-tests/appserv-tests/util/reporter/build.properties

diff --git a/appserver/tests/v2-tests/appserv-tests/util/reporter/build.properties b/appserver/tests/v2-tests/appserv-tests/util/reporter/build.properties
index af21993..c9cdeec 100755
--- a/appserver/tests/v2-tests/appserv-tests/util/reporter/build.properties
+++ b/appserver/tests/v2-tests/appserv-tests/util/reporter/build.properties
@@ -18,7 +18,7 @@
  
 
 <property environment="myenv" />
-<property name="javapath" value="${myenv.JAVA_HOME}/lib/dt.jar:$(myenv.JAVA_HOME)/lib/tools.jar:${myenv.S1AS_HOME}/modules/javax.ejb.jar"/>
+<property name="javapath" value="${myenv.JAVA_HOME}/lib/dt.jar:$(myenv.JAVA_HOME)/lib/tools.jar:${myenv.S1AS_HOME}/modules/jakarta.ejb.jar"/>
 
 <property name="classpath" value="${javapath}"/>
 

appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java

diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java
index 1e6e6fb..9c80e0b 100644
--- a/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java
+++ b/appserver/web/web-core/src/main/java/org/apache/catalina/session/StandardSession.java
@@ -2077,7 +2077,7 @@
             }
              */ 
             //original Hercules code was next line
-            //else if (value instanceof Serializable || value instanceof javax.ejb.EJBLocalObject || value instanceof javax.naming.Context || value instanceof javax.ejb.EJBLocalHome ) { //Bug 4853798
+            //else if (value instanceof Serializable || value instanceof jakarta.ejb.EJBLocalObject || value instanceof javax.naming.Context || value instanceof jakarta.ejb.EJBLocalHome ) { //Bug 4853798
             //FIXME: IndirectlySerializable includes more than 3 classes in Hercules code
             //need to explore implications of this
 

appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java

diff --git a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java
index bac78af..f23d920 100644
--- a/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java
+++ b/appserver/web/web-naming/src/main/java/org/apache/naming/factory/EjbFactory.java
@@ -130,7 +130,7 @@
                 }
             } else {
                 String javaxEjbFactoryClassName =
-                    System.getProperty("javax.ejb.Factory",
+                    System.getProperty("jakarta.ejb.Factory",
                                        Constants.OPENEJB_EJB_FACTORY);
                 try {
                     factory = (ObjectFactory)

appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java

diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java
index f7c1dd8..03b3c7a 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/InjectionPointHelper.java
@@ -166,7 +166,7 @@
         for(Annotation next : annotations) {
 
             String className = next.annotationType().getName();
-            if( className.equals("javax.ejb.EJB") ||
+            if( className.equals("jakarta.ejb.EJB") ||
                 className.equals("jakarta.annotation.Resource") ||
                 className.equals("javax.persistence.PersistenceContext") ||
                 className.equals("javax.persistence.PersistenceUnit") ||

appserver/webservices/jsr109-impl/osgi.bundle

diff --git a/appserver/webservices/jsr109-impl/osgi.bundle b/appserver/webservices/jsr109-impl/osgi.bundle
index a23e58b..22ac8db 100644
--- a/appserver/webservices/jsr109-impl/osgi.bundle
+++ b/appserver/webservices/jsr109-impl/osgi.bundle
@@ -22,7 +22,7 @@
 Import-Package: \
                        com.sun.enterprise.deployment.*, \
                        com.sun.enterprise.config.serverbeans, \
-                       javax.ejb;resolution:=optional, \
+                       jakarta.ejb;resolution:=optional, \
                        * 
 # dependent flashlight package resolved at runtime
 DynamicImport-Package: org.glassfish.flashlight.provider