Jakarta EJB namespace transition
Signed-off-by: Gaurav Gupta <gaurav.gupta@payara.fish>
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;
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;
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 {
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 {
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.*;
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 {
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;
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;
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 {
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.*;
/**
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.*;
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;
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;
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 {
}
}
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;
}
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;
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 {
}
}
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;
}
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;
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() {
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;
}
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 {
}
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() {
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;
}
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 {
}
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() {
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;
}
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 {
}
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 {
}
}
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;
}
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();
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;
}
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();
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;
}
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();
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;
}
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();
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;
}
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;
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();
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;
}
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;
}
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");
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.
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);
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;
}
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.
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);
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;
}
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 {
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.*;
/**
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 {
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;
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();
}
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;
}
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;
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());
}
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;
}
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;
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 { }
}
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;
}
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;
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 { }
}
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;
}
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;
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 { }
}
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;
}
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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.*;
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 {
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);
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;
}
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 {
}
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;
}
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 {
}
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;
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() {
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;
}
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();
}
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;
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;
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
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;
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;
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
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;
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 {
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;
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 {
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>
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>
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>
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;
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.*;
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 {
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;
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;
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;
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 {
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 {
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 {
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 {
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 {
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 {
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;
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;
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)
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;
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;
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;
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>
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>
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;
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.*;
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 {
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;
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;
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;
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 {
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 {
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 {
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 {
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 {
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 {
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;
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;
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)
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;
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;
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;
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>
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>
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;
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.*;
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 {
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;
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;
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;
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 {
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 {
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 {
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 {
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 {
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 {
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;
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;
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)
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;
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;
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;
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>
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>
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;
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.*;
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 {
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;
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;
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;
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 {
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 {
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 {
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 {
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 {
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 {
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;
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;
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)
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;
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;
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;
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>
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>
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;
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.*;
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 {
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;
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;
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;
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 {
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 {
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 {
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 {
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 {
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 {
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;
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;
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)
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;
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;
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;
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;
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 { }
}
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;
}
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;
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 { }
}
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;
}
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;
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 { }
}
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;
}
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;
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 { }
}
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;
}
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;
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.*;
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.*;
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;
/**
*/
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;
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;
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.*;
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
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;
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;
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.*;
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
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;
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;
}
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;
}
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.
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.*;
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.*;
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;
/**
*/
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;
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 {
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
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;
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.*;
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;
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 {
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;
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;
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.*;
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;
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 {
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;
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
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
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.*;
/**
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.*;
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
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;
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
*/
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 {
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;
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 {
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 {
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.*;
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;
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>
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 {
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;
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;
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;
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;
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;
}
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;
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 {
}
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;
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;
}
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;
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;
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;
}
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;
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 {
}
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;
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;
}
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.*;
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.*;
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;
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})
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
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;
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(
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);
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.*;
/**
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.*;
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
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.*;
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 {
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;
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.*;
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 {
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;
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;
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;
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 {
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 {
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.*;
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 {
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;
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;
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 {
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;
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;
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;
}
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;
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;
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;
}
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;
}
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;
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;
}
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;
}
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;
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;
}
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;
}
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;
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;
}
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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 {
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.*;
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 {
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>
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>
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;
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();
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 {
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();
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 {
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();
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)
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;
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.*;
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.*;
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;
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;
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;
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})
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})
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;
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.*;
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.*;
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.*;
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.*;
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");
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));
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 {
}
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;
}
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;
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;
}
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;
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
*/
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 {
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;
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.*;
/**
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.*;
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
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>
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 {
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.*;
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 {
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;
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;
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;
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 {
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);
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>
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()
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();
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;
}
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;
}
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;
}
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;
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();
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;
}
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;
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;
}
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.*;
/**
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.*;
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
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;
/**
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.*;
/**
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;
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{
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;
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;
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{
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;
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;
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;
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;
}
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;
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 {
}
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;
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;
}
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;
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;
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;
}
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;
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 {
}
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;
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;
}
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.*;
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.*;
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 {
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 {
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;
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{
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}"/>
