Jakarta EJB namespace transition

Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
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());
         }
 
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 {
  
 }
 
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 {
     }
 
 }
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;
     
 }
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 {
     }
 
 }
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;
     
 }
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 {
  
 }
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 {
     }
 
 }
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;
     
 }
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 {
     }
 
 }
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;
     
 }